Merge remote-tracking branch 'origin/Mario/gameover_fixes'
authorMario <mario@smbclan.net>
Sun, 3 Jul 2016 23:16:41 +0000 (09:16 +1000)
committerMario <mario@smbclan.net>
Sun, 3 Jul 2016 23:16:41 +0000 (09:16 +1000)
1  2 
defaultXonotic.cfg

Simple merge