]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/music_player
authorterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:49:00 +0000 (23:49 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:49:00 +0000 (23:49 +0200)
1  2 
defaultXonotic.cfg

Simple merge