]> 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 | compact (merge: 0e4e793 b029bb2)
Merge remote branch 'origin/fruitiex/warpzone'
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:41:14 +0000 (11:41 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:41:14 +0000 (11:41 +0200)

Trivial merge