Google Git
Sign in
skia/external/github.com/ocornut/imgui/44174b1fa1815759c329c1f7670f23dc4316ab04
commit
44174b1fa1815759c329c1f7670f23dc4316ab04
[log]
author
omar <omarcornut@gmail.com>
Tue Jan 14 20:01:27 2020 +0100
committer
omar <omarcornut@gmail.com>
Tue Jan 14 20:01:27 2020 +0100
tree
2e3b804e5598d3b9c07ceb20054756506ac9b592
parent
861f786d816eac498be9ef95a3fabe49289ea6ee [diff]
parent
2ebe08be40da88eada47a8c2a5ba6f6c93e91acb [diff]
Merge branch 'master' into docking

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