1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-06 04:20:08 +00:00

Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
This commit is contained in:
ocornut 2025-01-14 13:46:39 +01:00
commit c0ae3258f9
11 changed files with 95 additions and 56 deletions

View file

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