]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'cbrutail/mapmodels-glowyplants' into cbrutail/map-forxtron
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 19 Sep 2013 12:40:35 +0000 (14:40 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 19 Sep 2013 12:40:35 +0000 (14:40 +0200)
commit849d867d739c97aabfdcb4a10224ecaf980c8314
tree17bbcd87c53ac4aa610ff94672cbf61e801696a3
parent438276ad3dc4e4463666b565a71cf14d8c48d3a3
parent38f6a93bce72c54636e69c04b4ef9b7f37b055fd
Merge branch 'cbrutail/mapmodels-glowyplants' into cbrutail/map-forxtron

mergy mergy fixed shader