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

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut 2022-06-30 20:17:48 +02:00
commit 5d0deebba4
12 changed files with 115 additions and 57 deletions

View file

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