Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h

...

This commit is contained in:

omar

2020-05-07 22:13:47 +02:00

parent 5116eee108 d33021d828

commit 582f4db59b

9 changed files with 1114 additions and 587 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1415

imgui_demo.cpp

File diff suppressed because it is too large Load Diff