Campbell Barton da8a7928c9 svn merge ^/trunk/blender -r41230:41266		2011-10-24 23:06:27 +00:00
..
bin	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
datafiles	svn merge ^/trunk/blender -r41150:41175	2011-10-24 05:00:53 +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 ^/trunk/blender -r41230:41266	2011-10-24 23:06:27 +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
environment-mswindows	set svn end of lines to native	2011-05-09 08:15:38 +00:00
environment-unix