Merge branch 'master_164' into viewport_164

Browse Source

# Conflicts:
#	imgui.cpp

features/sdl_renderer3_multiviewports

omar ago%!(EXTRA string=7 years)

parent 346f83e014 728b2ef026

commit 18d6490dbd

Whitespace

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

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available