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)
commit225e74332de2e71b4d084b75e422686a8ffaf6ee
treea292a41b14606c17c11e3349f1d655dbf82461a6
parentfcfa8aa2aec52e9e6d9c1e08b9cac9b8fbdebf1a
parent5d84c659e4c2c51c996b5330fa19c8a24887e42d
Merge remote-tracking branch 'origin/master' into samual/combined_updates
gamemodes.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc