Google Git
Sign in
skia/external/github.com/ocornut/imgui/4cb0fe3c7dda31a033ce6f55d76aedd1c5893012
commit
4cb0fe3c7dda31a033ce6f55d76aedd1c5893012
[log]
author
ocornut <omarcornut@gmail.com>
Tue Apr 16 14:24:13 2024 +0200
committer
ocornut <omarcornut@gmail.com>
Tue Apr 16 14:24:13 2024 +0200
tree
80769c6fcbf3329b491bd3e4b45aa8b2decb399a
parent
c1743eef48432a08438de0926a6fc657e5ce2d11 [diff]
parent
7b8107e7c8485efebf1b1d42e1497119be9ea85a [diff]
Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdl3.h
#	docs/CHANGELOG.txt
#	imgui_internal.h
tree: 80769c6fcbf3329b491bd3e4b45aa8b2decb399a
  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