[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42334] branches/bmesh/blender: svn merge ^/trunk/blender -r42329:42333

[Campbell Barton]

Revision: 42334
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42334
Author:   campbellbarton
Date:     2011-12-02 03:32:59 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42329:42333

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42329

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42329
   + /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42333


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42329
   + /trunk/blender/release:31524-42333


Property changes on: branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42329
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42333