Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

omar

2018-12-11 12:41:40 +01:00

parent 26b9e2d0a5 54a60aaa40

commit c40feabe4d

8 changed files with 1374 additions and 23 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_widgets.cpp

+790

File diff suppressed because it is too large Load Diff