From: cbrutail Date: Thu, 19 Sep 2013 12:40:35 +0000 (+0200) Subject: Merge branch 'cbrutail/mapmodels-glowyplants' into cbrutail/map-forxtron X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=849d867d739c97aabfdcb4a10224ecaf980c8314;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'cbrutail/mapmodels-glowyplants' into cbrutail/map-forxtron mergy mergy fixed shader --- 849d867d739c97aabfdcb4a10224ecaf980c8314