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
qcsrc/menu/classes.c

Simple merge
Simple merge