]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ceddf08 930108c)
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 patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/mainwindow.c patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/menu/xonotic/mainwindow.c
Simple merge