Campbell Barton 121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

..

blender

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

blenderplayer

svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs

2011-11-10 03:05:11 +00:00

creator

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

bmesh: fixed merge issues with navmesh (though I've not tested if it works yet).

2011-11-08 00:20:50 +00:00

icons

…

tests

Cycles: svn merge -r41225:41232 ^/trunk/blender

2011-10-24 22:32:00 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

…