Merge branch 'master' into navigation

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

omar

2017-08-22 19:55:59 +08:00

parent 8e89809078 141339e4b7

commit 8581050002

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

Diff Content Not Available