svn merge ^/trunk/blender -r42935:42940
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 15:14:52 +0000 (15:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 15:14:52 +0000 (15:14 +0000)
commitae2ff6fe476a489fba5683090c9885f56a658ec5
treed0d625e0bb8c5de5e270a3fba63ebade24dd295e
parent74b3584181a5a40ea43f5be8173f998cf5df6f14
parent6e94bdd8e433d2c7f250b1998ce5acaefd5bac5e
svn merge ^/trunk/blender -r42935:42940
source/blender/blenloader/intern/readfile.c