Merge branch 'master' into TimePath/experiments/csqc_prediction
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 11:48:00 +0000 (22:48 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 11:48:00 +0000 (22:48 +1100)
commit47b33b5fc37228a800a34b506ac655c53ed323db
tree5ab4454853bd588f3257fac16c6d387d9c7b6a58
parent39ad43d556ac7cfcb5e34dd7c7f83c7e43dfaa68
parente6eb6e7fc36a3a243c5171b8cc3db88e823514d4
Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
qcsrc/server/cl_physics.qc
qcsrc/client/Main.qc
qcsrc/client/movetypes.qc
qcsrc/client/progs.src
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/progs.src