Google Git
Sign in
skia/external/github.com/ocornut/imgui/b85f34536917b7a75ae91a6eb0998b1be4a365af
commit
b85f34536917b7a75ae91a6eb0998b1be4a365af
[log]
author
omar <omarcornut@gmail.com>
Fri Sep 14 11:32:55 2018 +0200
committer
omar <omarcornut@gmail.com>
Fri Sep 14 11:32:55 2018 +0200
tree
e07f3d05464b936206d0363406bf7fff3e444d97
parent
85a3fb3bef7261fd5ccd247c36c0edeb4a1005ec [diff]
parent
c12da2a60798d2b71b3804063c4de4d0653ef1a0 [diff]
Merge branch 'master' into viewport

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
tree: e07f3d05464b936206d0363406bf7fff3e444d97
  1. .github/
  2. docs/
  3. examples/
  4. misc/
  5. .travis.yml
  6. imconfig.h
  7. imgui.cpp
  8. imgui.h
  9. imgui_demo.cpp
  10. imgui_draw.cpp
  11. imgui_internal.h
  12. imgui_widgets.cpp
  13. imstb_rectpack.h
  14. imstb_textedit.h
  15. imstb_truetype.h
  16. LICENSE.txt