]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 17:17:07 +0000 (18:17 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 17:17:07 +0000 (18:17 +0100)
commit7d598e2ceac754fdf948dbf14ecc1bd71428c38b
tree674d3639cd479a3630a7738f4ead972281982e04
parenta9f8e4f7722bf4eb342736f6f4d2d673a19b1661
parentfb0c942af7b26bec67c2483141bfe859589759d9
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone