svn merge -r39830:39831 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Sep 2011 01:28:45 +0000 (01:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Sep 2011 01:28:45 +0000 (01:28 +0000)
commit6510b66efa24cdf21e1428ffee2bc69cb910a38e
tree24a3d7dddc8e2b671369fd0bd0de429c42534038
parentfb3f7d95664dd71a545061ddf8d75726ff423c10
parenta22dc764bbb68bf05ddfd567c27229fbf1a63271
svn merge -r39830:39831 https://svn.blender.org/svnroot/bf-blender/trunk/blender