Merge remote-tracking branch 'origin/master' into tzork/gm_nexball
authorJakob MG <jakob_mg@hotmail.com>
Wed, 28 Dec 2011 09:44:51 +0000 (10:44 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 28 Dec 2011 09:44:51 +0000 (10:44 +0100)
commit8f4d064a1d62a040e788fc0634baf93e888ba2f6
tree5ec4cb85ac2d016ab453ebbaf16f177942d8c23c
parentfc972486ea0e2edaadb44ba226a0672d8ad19226
parent32e16889b1b89f22435e082e4fb570ff68e9121f
Merge remote-tracking branch 'origin/master' into tzork/gm_nexball
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc