]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitfbb2508f740a7458edb2517369241b40cc02b744
tree1655bf010199234619aaa354ca87c2198044dda0
parent9135a4701b33e9d98e8a3b62e133413d22f31384
parenta4ccbd75da12da9090f3d25ad4dc9edd0efe3060
Merge branch 'master' into terencehill/music_player
defaultXonotic.cfg