svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17279:HEAD
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Nov 2008 15:11:40 +0000 (15:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Nov 2008 15:11:40 +0000 (15:11 +0000)
somehow scripts line endings change is messing things up, these changes wont be included
error is:
svn: File 'release/scripts/scripttemplate_metaball_create.py' has inconsistent newlines
svn: Inconsistent line ending style
svn: Error reading spooled REPORT request response


Trivial merge