Google Git
Sign in
skia/external/github.com/ocornut/imgui/5628416bd3a0e8a71ce4daff49186ecfcc986d6a
commit
5628416bd3a0e8a71ce4daff49186ecfcc986d6a
[log]
author
omar <omarcornut@gmail.com>
Thu Jun 25 14:03:40 2020 +0200
committer
omar <omarcornut@gmail.com>
Thu Jun 25 14:03:40 2020 +0200
tree
0fa53526fc140f6e6260c1e58249efdd7d92bf46
parent
7538bbabb62da3105b62ca596827407f638c2e27 [diff]
parent
fed80b95375f716536ceaa3c5e8b21c96e150bff [diff]
Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
tree: 0fa53526fc140f6e6260c1e58249efdd7d92bf46
  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