Skip to content
Snippets Groups Projects
Commit e6e5856f authored by mazmazz's avatar mazmazz
Browse files

Merge branch 'auto-joystick' into 'master' 

Use Joystick 1 and Joystick 2 by default if plugged in

See merge request STJr/SRB2!364
parents 631f6ed4 c799584f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment