]> 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: a12310d 1ad5568)
Merge remote branch 'origin/fruitiex/campaigntweak'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 20:05:52 +0000 (21:05 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 20:05:52 +0000 (21:05 +0100)

Trivial merge