]> 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: abf0f61 c131c80)
Merge branch 'master' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Sun, 23 Oct 2011 16:27:06 +0000 (18:27 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Sun, 23 Oct 2011 16:27:06 +0000 (18:27 +0200)

Trivial merge