Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 16 Feb 2014 04:56:23 +0000 (23:56 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 16 Feb 2014 04:56:23 +0000 (23:56 -0500)
1  2 
defaultXonotic.cfg
gamemodes.cfg
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
qcsrc/server/autocvars.qh
qcsrc/server/cl_player.qc

Simple merge
diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge