Merge branch 'master' into TimePath/experiments/csqc_prediction
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 21 Jan 2015 06:17:36 +0000 (17:17 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 21 Jan 2015 06:17:36 +0000 (17:17 +1100)
1  2 
defaultXonotic.cfg

Simple merge