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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/SConscript