]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d886457 eac954f)
Merge remote branch 'origin/morphed/teleporter'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 19 Jul 2011 18:06:12 +0000 (20:06 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 19 Jul 2011 18:06:12 +0000 (20:06 +0200)

Trivial merge