Merge branch 'master' into Mario/qc_physics_prehax
authorMario <zacjardine@y7mail.com>
Mon, 16 Mar 2015 14:00:45 +0000 (01:00 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 16 Mar 2015 14:00:45 +0000 (01:00 +1100)
commit6be3fc1c5d51414554bb8f8f05dee5a0d12f7688
treef9b7d2164a3a6cfe93d0a73457a460730677322d
parenta37826300e6ea1f6bf1947575c10bb8930f25d9e
parent818fce31675b784a8b1b9b36c0f90fe1d3500eba
Merge branch 'master' into Mario/qc_physics_prehax
qcsrc/client/effects.qc
qcsrc/common/triggers/func/breakable.qc
qcsrc/common/triggers/target/spawn.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc