]> 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: 86b5286 934a471)
Merge branch 'fruitiex/cubemaps' into fruitiex/epsilon
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 13:53:04 +0000 (16:53 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 13:53:04 +0000 (16:53 +0300)

Trivial merge