]> 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: 4b834a8 e575b7d)
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 15:41:48 +0000 (16:41 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 15:41:48 +0000 (16:41 +0100)

Trivial merge