Tamito Kajiyama 94ae0232b0 Merged changes in the trunk up to revision 53729. ... Conflicts resolved: release/datafiles/startup.blend source/blender/blenloader/intern/readfile.c		2013-01-12 02:02:53 +00:00
..
bin	A big cleaning patch by Bastien Montagne (thanks a lot!)	2012-12-11 22:00:22 +00:00
darwin	set line endings to native & mime type to text/plain for .app/Contents/MacOS/xxx files.	2012-12-29 03:19:30 +00:00
datafiles	Merged changes in the trunk up to revision 53729.	2013-01-12 02:02:53 +00:00
freedesktop	patch to our desktop file from debian, German translation.	2012-04-16 09:56:12 +00:00
scripts	Merged changes in the trunk up to revision 53729.	2013-01-12 02:02:53 +00:00
text	Readme and Release Log Links:	2012-11-20 01:55:22 +00:00
windows	style cleanup	2012-10-20 18:46:57 +00:00
environment-macosx
environment-mswindows	set svn end of lines to native	2011-05-09 08:15:38 +00:00
environment-unix