Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators
authorSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 01:01:32 +0000 (20:01 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 01:01:32 +0000 (20:01 -0500)
commit66cf5d96044bf7bdc5b2c243e84af1b3c4f0efb0
tree920c6cd1dd0c5955ccc136d898d20979d5ef92d9
parent6ec0f2147065145e9310fc5af6e16243ef805a0f
parent48388e38c1377c33f08feed8e76c0a2c9212a20c
Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/progs.src