Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)
1  2 
gamemodes.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc

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