Merge branch 'master' into Mario/lms_updates
authorMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 05:39:35 +0000 (15:39 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 05:39:35 +0000 (15:39 +1000)
commit332b1bfac54491c16e6ef8a806fcc1d5dd768ef6
tree501d1242c537ca85e1915e9c280045a7545939a5
parentd770f44123c140eb3c19f2f10beb6aeb00e2b133
parent3dc40508b67a99d214d774104ecaa0b974d704aa
Merge branch 'master' into Mario/lms_updates
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/progs.src
qcsrc/server/scores.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc