]> 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: 69ef44e cfb5c99)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 6 Jun 2010 18:47:10 +0000 (21:47 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 6 Jun 2010 18:47:10 +0000 (21:47 +0300)

Trivial merge