]> 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: 9f1cf34 8b707be)
Merge remote branch 'refs/remotes/origin/mookow/map-g-23'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 05:10:35 +0000 (07:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 05:10:35 +0000 (07:10 +0200)

Trivial merge