]> 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: bb09464 e62f7ab)
Merge remote branch 'origin/fruitiex/campaign'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 18 Dec 2010 20:16:13 +0000 (21:16 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 18 Dec 2010 20:16:13 +0000 (21:16 +0100)

Trivial merge