]> 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: 0b775d0 16e00ea)
Merge branch 'cbrutail/texturesex2x-greentrims' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 6 Oct 2011 20:38:51 +0000 (22:38 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 6 Oct 2011 20:38:51 +0000 (22:38 +0200)

Trivial merge