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

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
This commit is contained in:
ocornut 2023-04-13 16:24:09 +02:00
commit 0ea3b87bd6
10 changed files with 207 additions and 144 deletions

View file

@ -1,4 +1,4 @@
// dear imgui, v1.89.5 WIP
// dear imgui, v1.89.5
// (widgets code)
/*