Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

omar

2019-06-05 16:09:06 +02:00

parent 440ad0b440 c96f2c4057

commit e6850891cc

7 changed files with 364 additions and 189 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

imgui.cpp

+175 -137

File diff suppressed because it is too large Load Diff