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
..
bin	SVN maintenance.	2011-10-25 13:44:35 +00:00
datafiles	Fix #29198: Problem with text interface when you enable the International fonts	2011-11-08 15:12:41 +00:00
freedesktop	synched with trunk at revision 36569	2011-05-16 20:30:59 +00:00
plugins	svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full	2011-10-24 22:18:32 +00:00
scripts	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
text	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
windows	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
environment-macosx	shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.	2009-11-02 06:33:16 +00:00
environment-mswindows	set svn end of lines to native	2011-05-09 08:15:38 +00:00
environment-unix	shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.	2009-11-02 06:33:16 +00:00