Merge branch 'master' into terencehill/music_player
authorterencehill <piuntn@gmail.com>
Sat, 3 Aug 2013 09:53:35 +0000 (11:53 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 3 Aug 2013 09:53:35 +0000 (11:53 +0200)
commit8bd579d6ca74881bd77ae83fd00ac81c9e0108cf
tree92151096c80cb8fe63b80a8404804d5941b91b54
parent00f51ea6efa358e6188a6a839e3c0e50177f2e14
parent56ed5bb264f69cc4a9020460423183757998205b
Merge branch 'master' into terencehill/music_player
defaultXonotic.cfg
qcsrc/menu/classes.c