]> 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: 586378c f433390)
Merge branch 'cbrutail/newtexture-facility114inxtrim_green' into cbrutail/map-arena
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 3 Oct 2011 13:56:32 +0000 (15:56 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 3 Oct 2011 13:56:32 +0000 (15:56 +0200)

Trivial merge