1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-20 01:34:20 +00:00

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut 2021-05-24 17:49:20 +02:00
commit 1b435ae3e0
13 changed files with 182 additions and 109 deletions

View file

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