Merge branch 'master' into TimePath/experiments/csqc_prediction
authorMario <zacjardine@y7mail.com>
Tue, 17 Feb 2015 19:49:51 +0000 (06:49 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 17 Feb 2015 19:49:51 +0000 (06:49 +1100)
commitd958c32f44eedae0d00b7361d542c281b517f7ea
tree526e8eb07a0f372f93ac4a46a4bfb0acac582e9e
parent4e85c153239969d8dccea38031e18ddb24b6c935
parentab627cfdaf4471d36df58a771b2dac1ff24e9de9
Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/common/csqcmodel_settings.qh
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/t_plats.qc