svn merge ^/trunk/blender -r40390:40394
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 07:20:27 +0000 (07:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 07:20:27 +0000 (07:20 +0000)
commitd92b5ea04ac8b661bb8caa7a1ca813e8f33a5a1c
tree238bc3e3511b6d26c49012e958599a8a883aa842
parentea4b3fee1f51db4e6cd53daf8071429991dc95e3
parent1657cbe61a756222feac5107f87d0d699a92b4a6
svn merge ^/trunk/blender -r40390:40394
source/blender/editors/transform/transform_conversions.c
source/blender/windowmanager/intern/wm_init_exit.c