Campbell Barton 14475d07cd svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

..

CMakeLists.txt

svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-11 08:28:16 +00:00

object_add.c

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

object_bake.c

svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 02:49:21 +00:00

object_constraint.c

/blender/editors: Removed final points in UI strings and messages.

2011-09-19 12:26:20 +00:00

object_edit.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

object_group.c

whitespace only, no functional change mixed tabs/spaces --> tabs.

2011-04-21 13:11:51 +00:00

object_hook.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

object_intern.h

svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-10 23:49:39 +00:00

object_lattice.c

svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits

2011-05-13 04:04:53 +00:00

object_modifier.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

object_navmesh.cpp

- fix for memory leak in findFreeNavPolyIndex()

2011-09-16 14:02:44 +00:00

object_ops.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

object_relations.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

object_select.c

/blender/editors: Removed final points in UI strings and messages.

2011-09-19 12:26:20 +00:00

object_shapekey.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

object_transform.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

object_vgroup.c

svn merge -r40295:40367 ^/trunk/blender

2011-09-21 17:15:54 +00:00

SConscript

svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-10 23:49:39 +00:00