Merge branch 'master' into navigation

Browse Source

# Conflicts:
#	imgui_internal.h

...

This commit is contained in:

omar

2018-01-03 12:33:27 +01:00

parent 7e03ee8d85 3c6fbe0849

commit 96ccc484f9

5 changed files with 110 additions and 110 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

+61 -71

File diff suppressed because it is too large Load Diff