]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1e85ec 7116e6c)
Merge branch 'master' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 2 Dec 2011 23:23:07 +0000 (00:23 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 2 Dec 2011 23:23:07 +0000 (00:23 +0100)

Trivial merge