svn merge ^/trunk/blender -r45927:HEAD --accept=theirs-full
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 9 May 2012 14:55:50 +0000 (14:55 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 9 May 2012 14:55:50 +0000 (14:55 +0000)
commit68179be662af72319694b30f5784640812211cd1
treed7fec3d79bf925cb9ed4c06bbcb89b7e65f49e4c
parent7b3beec987f4ee129480730889dfdae07acc6419
parente6a022816cd013b9d0399c4dc3beb522e144ac64
svn merge ^/trunk/blender -r45927:HEAD --accept=theirs-full

This revision does not compile. code need to be merged in manualy.
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c