From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 4 Jun 2010 18:33:23 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'
X-Git-Tag: xonotic-v0.1.0preview~170^2
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=cfb5c991a652b1463c0f9b3066bc2e611a99859c;hp=cfb5c991a652b1463c0f9b3066bc2e611a99859c

Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'
---