1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
This commit is contained in:
ocornut 2024-10-24 18:15:51 +02:00
commit 942b64abfc
27 changed files with 984 additions and 20 deletions

View file

@ -1,4 +1,4 @@
// dear imgui, v1.91.4
// dear imgui, v1.91.5 WIP
// (drawing and font code)
/*