]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a5d42f 4a24788)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 17 Jun 2010 13:17:43 +0000 (16:17 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 17 Jun 2010 13:17:43 +0000 (16:17 +0300)

Trivial merge