1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-05 04:10:07 +00:00

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdl3.cpp
This commit is contained in:
ocornut 2024-07-01 17:10:12 +02:00
commit 3369cbd277
14 changed files with 90 additions and 56 deletions

View file

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