svn merge ^/trunk/blender -r47210:47214
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 09:28:37 +0000 (09:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 09:28:37 +0000 (09:28 +0000)
commit1b10fdec48a50e05cc33ebb1914393576a08da2c
treec77cd83315adfe090f1f42824e40851602d31fe9
parentc53c19ce32a4a8f118091bf6452ff77ecec05d12
parent8ae1f3881263a92e58872b78418230297c70a76a
svn merge ^/trunk/blender -r47210:47214
source/blender/blenloader/intern/readfile.c