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

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut 2023-07-11 12:44:15 +02:00
commit f6feddd1ee
9 changed files with 125 additions and 39 deletions

View file

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