svn merge -r36840:36890 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 02:55:29 +0000 (02:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 02:55:29 +0000 (02:55 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/modifiers/intern/MOD_displace.c
source/creator/CMakeLists.txt

Simple merge