Campbell Barton 7495757553 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.

2011-09-06 01:23:43 +00:00

..

blender

svn merge -r39890:39889 source/blender/editors/object/object_relations.c source/blender/editors/object/object_hook.c

2011-09-06 01:23:43 +00:00

blenderplayer

svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c

2011-09-01 00:35:30 +00:00

creator

svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-24 02:29:45 +00:00

darwin

set svn end of lines to native

2011-05-09 08:15:38 +00:00

gameengine

svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 12:57:33 +00:00

icons

set svn end of lines to native

2011-05-09 08:15:38 +00:00

tests

minor warning fixes, also correct some float -> double promotions in shadeoutput.c

2011-09-02 03:32:57 +00:00

CMakeLists.txt

Code cleanup: remove source/kernel module, this wasn't really the kernel of

2011-05-06 20:18:42 +00:00

SConscript

Code cleanup: remove source/kernel module, this wasn't really the kernel of

2011-05-06 20:18:42 +00:00