]> git.xonotic.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:09:03 +0000 (18:09 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 17:09:03 +0000 (18:09 +0100)
commita9f8e4f7722bf4eb342736f6f4d2d673a19b1661
treeb0d9989286e474b32c53e89351d92b3f63672461
parent84634b2315a377ef5b3e3de91e209aac2706186d
parentf027d45fffedd3018e8d5db4ab54b9f96008ea27
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone