]> 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: 8f82698 27e0dce)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 30 Apr 2013 19:52:20 +0000 (05:52 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 30 Apr 2013 19:52:20 +0000 (05:52 +1000)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/menu/classes.c patch | diff1 | diff2 | blob | history

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