Google Git
Sign in
skia/external/github.com/ocornut/imgui/582f4db59bc9f14c2ed80e43cc7d9472587988d7
commit
582f4db59bc9f14c2ed80e43cc7d9472587988d7
[log]
author
omar <omarcornut@gmail.com>
Thu May 07 22:13:47 2020 +0200
committer
omar <omarcornut@gmail.com>
Thu May 07 22:13:47 2020 +0200
tree
7f6fc5f59718d077877166068a21180b84145e07
parent
5116eee108986ba6f41eea6f8759eb6acc042670 [diff]
parent
d33021d82816a9e256301331e7ec84fd4cd7ddc2 [diff]
Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
tree: 7f6fc5f59718d077877166068a21180b84145e07
  1. .github/
  2. docs/
  3. examples/
  4. misc/
  5. .editorconfig
  6. .gitattributes
  7. .gitignore
  8. imconfig.h
  9. imgui.cpp
  10. imgui.h
  11. imgui_demo.cpp
  12. imgui_draw.cpp
  13. imgui_internal.h
  14. imgui_widgets.cpp
  15. imstb_rectpack.h
  16. imstb_textedit.h
  17. imstb_truetype.h
  18. LICENSE.txt