Merge remote-tracking branch 'origin/master' into terencehill/spectate_prev
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 01:10:59 +0000 (21:10 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 01:10:59 +0000 (21:10 -0400)
commit1633673cc6c65bdca0120f2a4fc33e8c2449f06d
tree20fa03201de8bab78299a10295199de5bdb52d4a
parentb0e4ebf4cf698adc8d6322fb366d0e6045d555e6
parent943e5ba6621b529fcbf0637e26f37f1cc4d07de6
Merge remote-tracking branch 'origin/master' into terencehill/spectate_prev
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/mutators/mutator_superspec.qc