]> 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: c412d3e d435aa2)
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)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge