Tamito Kajiyama 556912792a Merged changes in the trunk up to revision 54110. ... Conflicts resolved: source/blender/blenfont/SConscript source/blender/blenkernel/intern/subsurf_ccg.c source/blender/makesdna/intern/makesdna.c source/blender/makesrna/intern/rna_scene.c		2013-01-26 23:49:13 +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 54110.	2013-01-26 23:49:13 +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 54110.	2013-01-26 23:49:13 +00:00
text	Release Cycle:	2013-01-17 00:56:04 +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