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_glfw.cpp
This commit is contained in:
ocornut 2024-08-01 19:07:53 +02:00
commit d8c98c8c14
24 changed files with 127 additions and 24 deletions

View file

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