]> 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: 8d999b1 583298d)
Merge branch 'master' into cbrutail/darkzone
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Jan 2012 14:44:32 +0000 (15:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Jan 2012 14:44:32 +0000 (15:44 +0100)

Trivial merge