]> 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: 1ddcfdb 4dca75d)
Merge remote branch 'origin/fruitiex/runningmanctf' into savagex/techassault
authorRudolf Polzer <divverent@alientrap.org>
Thu, 30 Dec 2010 15:04:56 +0000 (16:04 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 30 Dec 2010 15:04:56 +0000 (16:04 +0100)

Trivial merge