Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar
2020-02-10 14:03:12 +01:00
12 changed files with 93 additions and 27 deletions

View File

@ -1,5 +1,5 @@
-----------------------------------------------------------------------
dear imgui, v1.75 WIP
dear imgui, v1.75
-----------------------------------------------------------------------
examples/README.txt
(This is the README file for the examples/ folder. See docs/ for more documentation)