Merge branch 'master' into navigation

Browse Source

# Conflicts:
#	imgui.cpp

features/sdl_renderer3_multiviewports

omar ago%!(EXTRA string=8 years)

parent 97a40e74fb 96d2942373

commit 1a62d46db5

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