]> 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: 00f51ea c464292)
Merge remote-tracking branch 'origin/master' into terencehill/music_player
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:15:51 +0000 (20:15 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:15:51 +0000 (20:15 -0400)
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