Merge branch 'master' into 2016-07-navigation

Browse Source

# Conflicts:
#	imgui.cpp

features/sdl_renderer3_multiviewports

omar ago%!(EXTRA string=8 years)

parent 03700ad15e b5ad88627d

commit 23fae61109

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available