Tamito Kajiyama 1f7ae143a2 Merged changes in the trunk up to revision 48227. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/editors/space_file/filelist.c		2012-06-24 10:29:26 +00:00
..
bin	Workaround for half-transparent windows when running blender-softwaregl	2011-11-15 07:28:18 +00:00
datafiles	style cleanup	2012-06-19 22:17:19 +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 48227.	2012-06-24 10:29:26 +00:00
text	Readme and Release Log Links:	2012-04-05 09:27:53 +00:00
windows	Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks a lot!	2012-04-25 11:15:55 +00:00
environment-macosx
environment-mswindows	set svn end of lines to native	2011-05-09 08:15:38 +00:00
environment-unix