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)
commitaa1ba2f3fb946513963f5aec73105838f954e8e2
treecec161e01ebdff96c1ebee2f1f16d371847f55d7
parentb98b4e8be868c5de426a1d2d08d66035b26552e6
parent8916f84622ccadbbb4111b03117cc6cc9ad9fe0a
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17279:HEAD
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