Merge branch 'master' into TimePath/issue-1170
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 13 Dec 2014 01:33:53 +0000 (12:33 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 13 Dec 2014 01:33:53 +0000 (12:33 +1100)
1  2 
defaultXonotic.cfg
qcsrc/menu/xonotic/mainwindow.c

Simple merge
Simple merge