]> 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: 0f640a4 b1067bb)
Merge remote-tracking branch 'origin/cbrutail/darkzone'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 29 Feb 2012 09:46:55 +0000 (10:46 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 29 Feb 2012 09:46:55 +0000 (10:46 +0100)

Trivial merge