Google Git
Sign in
skia/external/github.com/ocornut/imgui.git/222dd775fc72229675757f90d887ec57a291dc0e
commit
222dd775fc72229675757f90d887ec57a291dc0e
[log]
author
ocornut <omarcornut@gmail.com>
Tue May 28 17:11:57 2024 +0200
committer
ocornut <omarcornut@gmail.com>
Tue May 28 17:11:57 2024 +0200
tree
ef2afc89d78f8c267e19af796e3e12f43a3f3a1e
parent
2db79d0868f7b02d26f7557a72504a0b6f844937 [diff]
parent
5cbc34a10c0a3aecfeea0cae0c861684101dc5f2 [diff]
Merge branch 'master' into docking

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