Merge branch 'master' into drag_and_drop

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui.h

...

This commit is contained in:

omar

2017-12-11 16:39:27 +01:00

parent a4863e8084 f06f68f3ce

commit 2b9d8ab91d

6 changed files with 590 additions and 354 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

784

imgui.cpp

File diff suppressed because it is too large Load Diff