Campbell Barton 685041d53a 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
..
blender	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
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 ^/trunk/blender -r41602:41638 .	2011-11-08 02:57:28 +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	set svn end of lines to native	2011-05-09 08:15:38 +00:00
tests	svn merge ^/trunk/blender -r41226:41227 .	2011-10-24 12:43:08 +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	Code cleanup: remove source/kernel module, this wasn't really the kernel of	2011-05-06 20:18:42 +00:00