Merge branch 'master' into terencehill/menu_weaponarena_selection_fix

Conflicts:
	qcsrc/menu/xonotic/radiobutton.qc

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
Simple merge

diff --cc qcsrc/menu/xonotic/radiobutton.qc
index 51f4cc6a2cfb2df33157b71ce1587c253276d3bc,1d2676f1f4db34924bbf1e1cedffc522435ebc37..65f2486f2111e57d749bc28ff73ac2aff1254afa
--- 1/qcsrc/menu/xonotic/radiobutton.qc
--- 2/qcsrc/menu/xonotic/radiobutton.qc
+++ b/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)