Merge branch 'Mario/config_updates'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:08:26 +0000 (01:08 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:08:26 +0000 (01:08 +1100)
commitbbd25803840bd247e33b88250a402b31c196b717
treef40d9997bbd3cfb5183b6ec825c5ae4f1c09bd2c
parentc412d3eef639e2d8b68682c51fd44bedb5d4308f
parentd435aa26b0f66be08b5ed599c7cf410f0f1e4365
Merge branch 'Mario/config_updates'
defaultXonotic.cfg