Google Git
Sign in
skia/external/github.com/ocornut/imgui.git/e863f89d391625c360b232c9fe4b30f378c142eb
commit
e863f89d391625c360b232c9fe4b30f378c142eb
[log]
author
ocornut <omarcornut@gmail.com>
Thu Jun 20 17:45:47 2024 -0700
committer
ocornut <omarcornut@gmail.com>
Thu Jun 20 17:47:22 2024 -0700
tree
91f88480ca2e71988dd80fb7c296329582095462
parent
416cfdb99d9e2eb251cf64fd45d5715ba4b49e23 [diff]
parent
21581cf70cef16db7e9a7095703f3233997596ff [diff]
Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
tree: 91f88480ca2e71988dd80fb7c296329582095462
  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