svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 00:31:00 +0000 (00:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 00:31:00 +0000 (00:31 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesrna/RNA_access.h
source/blender/modifiers/CMakeLists.txt

Simple merge