Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h

...

This commit is contained in:

omar

2018-05-07 22:23:58 +02:00

parent c7687fc1d6 0bf43b3a1b

commit 4ff23d3306

25 changed files with 671 additions and 514 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

735

imgui.cpp

File diff suppressed because it is too large Load Diff