Merge branch 'master' into TimePath/experiments/csqc_prediction (blame TimePath if...
authorMario <zacjardine@y7mail.com>
Tue, 27 Jan 2015 07:59:18 +0000 (18:59 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 27 Jan 2015 07:59:18 +0000 (18:59 +1100)
commitf5517806dce5953f2a2dc2e9312032e99abcf6d0
tree3b84a8e04f1734d6b521feab87a9e454829989ca
parentce4e626fe2d78ad7779e4e9ccc9cc46f850493ea
parent3cccadd3f93d6d5fc75a8d8aef8249f97bd83d0d
Merge branch 'master' into TimePath/experiments/csqc_prediction (blame TimePath if everything is broken)

Conflicts:
qcsrc/server/cl_physics.qc
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/common/physics.qc
qcsrc/common/stats.qh
qcsrc/server/miscfunctions.qc