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)
commit7a9b9db4841ed22dbed5a7a3645fe8fff9724ceb
treeeb7b97690f32ac6c4bdc61ccf03bf4bee4d5c126
parent3281850ad7e45f42fb44a684e9df0e4154d61317
parentcff9142d7732b7722fc7878fa6a98a4548823e43
Merge remote-tracking branch 'origin/master' into samual/combined_updates
defaultXonotic.cfg
gamemodes.cfg
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
qcsrc/server/autocvars.qh
qcsrc/server/cl_player.qc