Merge branch 'master' into Mario/lms_updates
authorMario <mario.mario@y7mail.com>
Sat, 4 May 2013 22:01:48 +0000 (08:01 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 4 May 2013 22:01:48 +0000 (08:01 +1000)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge