Campbell Barton e08c4a00d2 svn merge -r41371:41420 ^/trunk/blender		2011-11-01 02:01:09 +00:00
..
bin	SVN maintenance.	2011-10-25 13:44:35 +00:00
datafiles	Renaming the extensionless "blenderbuttons" to "blender_icons.png"	2011-10-28 00:09:13 +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 -r41371:41420 ^/trunk/blender	2011-11-01 02:01:09 +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