svn merge ^/trunk/blender -r43124:43160
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 11:23:24 +0000 (11:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 11:23:24 +0000 (11:23 +0000)
1  2 
CMakeLists.txt
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_edit.c
source/creator/creator.c

diff --cc CMakeLists.txt
Simple merge
Simple merge