Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146. ... Conflicts resolved: release/datafiles/startup.blend source/blender/blenkernel/CMakeLists.txt source/blender/blenlib/intern/bpath.c source/blender/blenloader/intern/readfile.c		2012-12-19 01:49:58 +00:00
..
bin	A big cleaning patch by Bastien Montagne (thanks a lot!)	2012-12-11 22:00:22 +00:00
darwin	OSX: add plist key High Resolution Capable	2012-12-13 12:46:11 +00:00
datafiles	Merged changes in the trunk up to revision 53146.	2012-12-19 01:49:58 +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 53146.	2012-12-19 01:49:58 +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	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