From: Mario Date: Tue, 17 Feb 2015 19:49:51 +0000 (+1100) Subject: Merge branch 'master' into TimePath/experiments/csqc_prediction X-Git-Tag: xonotic-v0.8.1~38^2~36^2 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d958c32f44eedae0d00b7361d542c281b517f7ea Merge branch 'master' into TimePath/experiments/csqc_prediction Conflicts: qcsrc/server/miscfunctions.qc qcsrc/server/miscfunctions.qh --- d958c32f44eedae0d00b7361d542c281b517f7ea