Tamito Kajiyama 8925ed1420 Merged changes in the trunk up to revision 46557. ... Conflicts resolved: source/blender/blenkernel/intern/material.c source/blender/blenkernel/intern/subsurf_ccg.c source/blender/blenloader/intern/readfile.c source/blender/editors/animation/anim_channels_defines.c source/blender/makesrna/intern/rna_scene.c Additional changes: * Fix for recent changes of BKE_* function renaming. * Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().		2012-05-11 22:48:41 +00:00
..
bin	Workaround for half-transparent windows when running blender-softwaregl	2011-11-15 07:28:18 +00:00
datafiles	Add new mask-brush icon from Julio Iglesias.	2012-05-10 20:35:12 +00:00
freedesktop	patch to our desktop file from debian, German translation.	2012-04-16 09:56:12 +00:00
plugins	style cleanup: changes to brace placement / newlines - for/while/if/switch	2012-04-28 06:31:57 +00:00
scripts	Merged changes in the trunk up to revision 46557.	2012-05-11 22:48:41 +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