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)
commitf88b7ab24a1e8263b1878ddb9be8fa441b39fe68
tree62726c0fe93cf5825d91680d29cfaef8264d5d8d
parentb90dca7b2798825de6bd279bcc12cd22d91fcce4
parentdcf8a85693db60468fde21e1eaa64043576edb0d
Merge branch 'master' into TimePath/experiments/csqc_prediction
defaultXonotic.cfg