Google Git
Sign in
skia/external/github.com/ocornut/imgui.git/676497fe05907aa84980226aae32f2e4f91813c2
commit
676497fe05907aa84980226aae32f2e4f91813c2
[log]
author
ocornut <omarcornut@gmail.com>
Fri Aug 25 14:20:51 2023 +0200
committer
ocornut <omarcornut@gmail.com>
Fri Aug 25 14:20:51 2023 +0200
tree
7f2ba198e05519305f3bd76f3c574e3c0ece6489
parent
11613013860d149667302a258041dcd832069f36 [diff]
parent
4a8142449252c03e52116689f74a315f7b0100a3 [diff]
Merge branch 'master' into docking

ac64b65 on master seemed incorrect.

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