Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c		2012-11-19 00:41:11 +00:00
..
bin	Workaround for half-transparent windows when running blender-softwaregl	2011-11-15 07:28:18 +00:00
darwin	move source/darwin into release/darwin since these files are for osx packaging.	2012-11-18 07:41:38 +00:00
datafiles	Merged changes in the trunk up to revision 51985.	2012-11-07 22:12: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 52340.	2012-11-19 00:41:11 +00:00
text	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
windows	style cleanup	2012-10-20 18:46:57 +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