Merge commit 'origin/unuid-mipmaps' into unuid-mipmaps
commit1944979bb5662464cd14d4a841cf2d80b0e79430
authorAlbert Cardona <acardona@ini.phys.ethz.ch>
Mon, 2 Mar 2009 12:41:52 +0000 (2 13:41 +0100)
committerAlbert Cardona <acardona@ini.phys.ethz.ch>
Mon, 2 Mar 2009 12:41:52 +0000 (2 13:41 +0100)
tree3b37b2f6282ba3a82ccca133afe17b931a21549a
parent684e0b58424df0784f4610737c3dcd4a49fe3a4a
parentbc8f82c5218b52260ae92d7009c716d0d25bfa9b
Merge commit 'origin/unuid-mipmaps' into unuid-mipmaps