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

Merge branch '2122-next' into 'next' 

Revert "Merge branch 'menu-mpjoy-fix' into 'next'"

See merge request !419
parents b5d4bb35 c0c05043
No related branches found
No related tags found
3 merge requests!488Merge in next and don't billboard papersprites in GL,!420Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version],!419Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 6 deletions
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