Merge branch 'viewport' into docking

Browse Source

# Conflicts:
#	imgui_demo.cpp

...

This commit is contained in:

omar

2018-10-25 23:45:19 +02:00

parent 1a6eea012d 50f6e12d31

commit 168af9b377

9 changed files with 2203 additions and 2134 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

3862

imgui_demo.cpp

File diff suppressed because it is too large Load Diff