Merge commit '7326ff096d0fc60086f2' into v0.8.0

This commit is contained in:
Michael Martin
2020-04-04 17:52:44 -07:00
53 changed files with 3081 additions and 1739 deletions
+1 -1
View File
@@ -313,7 +313,7 @@ uqm_prepare_config()
USE_INTERNAL_MIKMOD=""
use_library libmikmod
}
CHOICE_mikmod_DEFAULT=external
CHOICE_mikmod_DEFAULT=internal
CHOICE_joystick_OPTIONS="enabled disabled"
CHOICE_joystick_TITLE="Joystick support"