]> 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: 4c5d47f 574425c)
Merge branch 'cbrutail/texture-exx_wall-metal01c' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 13 Feb 2012 19:40:28 +0000 (20:40 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 13 Feb 2012 19:40:28 +0000 (20:40 +0100)

Trivial merge