Google Git
Sign in
skia/external/github.com/ocornut/imgui.git/3e7f1d42db5bd641a302feeefbd2a11765e14f1b
commit
3e7f1d42db5bd641a302feeefbd2a11765e14f1b
[log]
author
ocornut <omarcornut@gmail.com>
Tue Jun 18 17:45:17 2024 -0700
committer
ocornut <omarcornut@gmail.com>
Tue Jun 18 17:45:17 2024 -0700
tree
24012f195ff590b66d0805122202f38cae5932fa
parent
64a82d73c96f84d978e9a8f19f64312ed9886561 [diff]
parent
21bda2ed994fdf2a1dc9a3cf474dac883971f408 [diff]
Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
tree: 24012f195ff590b66d0805122202f38cae5932fa
  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