Merge branch 'master' into navigation

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

omar 2017-08-22 18:22:41 +08:00

parent 9670fe9ca7 d5b0d51274

commit 7de68fbe3d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available