]> 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: 577d3f1 69b90d0)
Merge remote branch 'origin/fruitiex/runningmanctf'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 10:18:25 +0000 (11:18 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 10:18:25 +0000 (11:18 +0100)

Trivial merge