]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 17:10:24 +0000 (20:10 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 17:10:24 +0000 (20:10 +0300)

Trivial merge