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

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut 2021-02-10 21:28:16 +01:00
commit 239d09804d
14 changed files with 35 additions and 32 deletions

View file

@ -1,4 +1,4 @@
// dear imgui, v1.81 WIP
// dear imgui, v1.81
// (main code and documentation)
// Help: