Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar
2019-10-04 19:22:42 +02:00
15 changed files with 218 additions and 133 deletions

View File

@ -1,5 +1,5 @@
----------------------------------------------------------------------
dear imgui, v1.73
dear imgui, v1.74 WIP
----------------------------------------------------------------------
misc/fonts/README.txt
This is the Readme dedicated to fonts.