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)
commit93735d2e627b843f01841ec565221aa3854a2e6a
treef368596ecd90b9b4da9e14334f888a3b559b80a9
parent60da5ecc59ddef8d79f9ba5c0ce7348e6bdddb96
parent55f87426a3f58e4161eae8a7e8523f165cb9da00
Merge branch 'master' into Mario/lms_updates
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