Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)
commitcfb5c991a652b1463c0f9b3066bc2e611a99859c
tree0a6a0dadf527d098fbaf8570dc966642a1d98af6
parent4c81a3f2b71dcb54790fb603d0e9aa74c97267e6
parent7ee5593075b64ce17d30dfb30130cd7be0096bdb
Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'