]> 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: 4a24788 6f5323b)
Merge remote branch 'origin/morphed/mapstuff'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 18 Jun 2010 12:31:36 +0000 (14:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 18 Jun 2010 12:31:36 +0000 (14:31 +0200)

Trivial merge