Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
This commit is contained in:
omar
2020-04-12 20:24:18 +02:00
34 changed files with 213 additions and 165 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.76 WIP
// dear imgui, v1.76
// (demo code)
// Help: