Merge branch 'master' into navigation

Browse Source

# Conflicts:
#	imgui_internal.h

...

This commit is contained in:

omar

2017-12-13 22:09:08 +01:00

parent 16fb58984f f265e16b84

commit cc3192f347

4 changed files with 272 additions and 184 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

+180 -135

File diff suppressed because it is too large Load Diff