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)
commitdb7073760c3dbc7726f7f946aa108120d7a7100a
treebc88613cb4afc1a50fafdb55b44bfb6ed1e3ad57
parent00f51ea6efa358e6188a6a839e3c0e50177f2e14
parentc4642928dead2ea338554f1db1a3024809d01272
Merge remote-tracking branch 'origin/master' into terencehill/music_player
defaultXonotic.cfg
qcsrc/menu/classes.c