Merge branch 'master' into navigation

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h

...

This commit is contained in:

omar

2017-08-08 17:30:32 +08:00

parent 23fae61109 a78ef7a369

commit 30d1e5712a

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

938

imgui.cpp

File diff suppressed because it is too large Load Diff