Google Git
Sign in
skia/external/github.com/ocornut/imgui.git/7237d3e5c3a6b837b7b457460877cf5eea8c3745
commit
7237d3e5c3a6b837b7b457460877cf5eea8c3745
[log]
author
ocornut <omarcornut@gmail.com>
Fri Jun 21 16:07:15 2024 -0700
committer
ocornut <omarcornut@gmail.com>
Fri Jun 21 16:18:22 2024 -0700
tree
676a165440b56c6bac0fb5f53a650304f927e2b3
parent
66ed89b0cabf454bf71f0837d9a98db690e7a0e3 [diff]
parent
755bf2b8c2effb4bb8ce28c7ce8a7dbc3d40dd95 [diff]
Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
tree: 676a165440b56c6bac0fb5f53a650304f927e2b3
  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