From: Rudolf Polzer Date: Tue, 31 Aug 2010 20:24:59 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/mookow/shaderlist' X-Git-Tag: xonotic-v0.1.0preview~151^2~30 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b21d30c173adf87a39e99c2c15a2b949a3f91f0;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote branch 'refs/remotes/origin/mookow/shaderlist' --- 7b21d30c173adf87a39e99c2c15a2b949a3f91f0