svn merge -r39890:39889 source/blender/editors/object/object_relations.c source...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 01:23:43 +0000 (01:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 01:23:43 +0000 (01:23 +0000)
commit7495757553fe16d64dca7fa868845939edbbb06d
tree7fcad54aa4c18c7ea25caac99149a985cb3366c4
parent3126ab835d01fb45845993a67214d0292a7c506b
parenta01ffbbddb40c8f14f10aa5edf0cd1ba5dcc6942
svn merge -r39890:39889 source/blender/editors/object/object_relations.c  source/blender/editors/object/object_hook.c

This change has been reverted in trunk so reverse merging the merge.
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_relations.c