Merge branch 'master' into TimePath/experiments/csqc_prediction
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 5 Jan 2015 03:31:19 +0000 (14:31 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 5 Jan 2015 03:31:50 +0000 (14:31 +1100)
commit96d50426c7929a9f6b080f575cba5732aa3010d6
treea47a019d6f45e7dbb84fe643337f7c4f19857f98
parenta7bb2b78e1ec01f3d9c4adc57485fca615385568
parentaab7e000924210fc6339724d854eada8e44f8528
Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
qcsrc/server/cl_physics.qc
qcsrc/server/mutators/mutator_multijump.qc
12 files changed:
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/common/physics.qc
qcsrc/common/physics.qh
qcsrc/common/stats.qh
qcsrc/csqcmodellib/cl_player.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator_multijump.qc
qcsrc/server/t_jumppads.qc