]> 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: caadb36 7253f65)
Merge branch 'master' into cbrutail/darkzone
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:15:10 +0000 (10:15 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:15:10 +0000 (10:15 +0100)

Trivial merge