]> de.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: ade4baf 3dc4050)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Thu, 4 Apr 2013 22:29:36 +0000 (09:29 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 4 Apr 2013 22:29:36 +0000 (09:29 +1100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge