Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar
2019-06-17 11:10:14 +02:00
9 changed files with 38 additions and 32 deletions

View File

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