Merge branch 'master' into terencehill/menu_weaponarena_selection_fix
authorterencehill <piuntn@gmail.com>
Tue, 25 Aug 2015 22:25:49 +0000 (00:25 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 25 Aug 2015 22:25:49 +0000 (00:25 +0200)
Conflicts:
qcsrc/menu/xonotic/radiobutton.qc

1  2 
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/radiobutton.qc

@@@ -15,9 -15,9 +15,9 @@@ CLASS(XonoticRadioButton, RadioButton
        ATTRIB(XonoticRadioButton, cvarName, string, string_null)
        ATTRIB(XonoticRadioButton, cvarValue, string, string_null)
        ATTRIB(XonoticRadioButton, cvarOffValue, string, string_null)
 -      ATTRIB(XonoticRadioButton, getCvarValueFromCvar, float, 0)
 +      ATTRIB(XonoticRadioButton, cvarValueIsAnotherCvar, float, 0)
-       METHOD(XonoticRadioButton, loadCvars, void(entity))
-       METHOD(XonoticRadioButton, saveCvars, void(entity))
+       METHOD(XonoticRadioButton, loadCvars, void(entity));
+       METHOD(XonoticRadioButton, saveCvars, void(entity));
  
        ATTRIB(XonoticRadioButton, alpha, float, SKINALPHA_TEXT)
        ATTRIB(XonoticRadioButton, disabledAlpha, float, SKINALPHA_DISABLED)