svn merge -r41649:41650 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 01:58:48 +0000 (01:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 01:58:48 +0000 (01:58 +0000)
commitee1828be191e31c00820a25488acfca61f66e5bd
tree1bb607ec337cb356f7e2c8326a775764e7c2e06d
parent130b4429b0279b8be8afa3ce45e60a359b723add
parentdb75cc4cdebb536774a8f2d7601319e2c898ecb0
svn merge -r41649:41650 ^/trunk/blender
source/blender/editors/object/object_add.c
source/blenderplayer/bad_level_call_stubs/stubs.c