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)
Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge