svn merge -r37035:37078 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 1 Jun 2011 23:38:46 +0000 (23:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 1 Jun 2011 23:38:46 +0000 (23:38 +0000)
commit56795262ad0dc3a168f31ca524b6c637907b1b50
treef42f86019751ae56b00d63c3702fcd4a812f5bcc
parentf5318bc04da743c7271245b6237e4ce80a855b7d
parent81982140b862c07dc1a7ddc2ce995339b1eb4547
svn merge -r37035:37078 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/SConscript