Campbell Barton 75512cee82 reverting change made r20939 with custom data layer merging. ...

if this is really a fix it should be made in trunk first, but looks like it was committed by accident.

2011-05-11 08:43:39 +00:00

..

blender

reverting change made r20939 with custom data layer merging.

2011-05-11 08:43:39 +00:00

blenderplayer

=bmesh= merge from trunk at r36529

2011-05-08 23:43:18 +00:00

creator

svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-10 00:45:06 +00:00

darwin

set svn end of lines to native

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

gameengine

svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-09 09:38:48 +00:00

icons

set svn end of lines to native

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

tests

fix [#26906] Panorama Button (Camera Data Properties)

2011-04-15 12:08:17 +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