Merge branch 'master' into TimePath/experiments/csqc_prediction
authorMario <zacjardine@y7mail.com>
Sun, 11 Jan 2015 22:26:21 +0000 (09:26 +1100)
committerMario <zacjardine@y7mail.com>
Sun, 11 Jan 2015 22:26:21 +0000 (09:26 +1100)
commit27420384c238135c65b8873e5ada3082d8dcb515
tree14e2b90c26d963b3c5a3073d4ed0854d24c58613
parentb90dca7b2798825de6bd279bcc12cd22d91fcce4
parent28804d062ab79f9cfa2a6298c9b86afd7c225dba
Merge branch 'master' into TimePath/experiments/csqc_prediction
defaultXonotic.cfg