]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit402c9d84fe00cc341e02db9b6e3db5b617301ed6
treee85439f34d4ff367d2fbf38d690f716e20539681
parentceddf084c0eacb2eb030550449f4fbdfa8e3f642
parent930108cf8180c6f5da8d8945a73b0dc53d1c3b8d
Merge branch 'master' into TimePath/issue-1170
defaultXonotic.cfg
qcsrc/menu/xonotic/mainwindow.c