[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42936] branches/bmesh/blender/: svn merge ^/trunk/blender -r42931:42935

[Campbell Barton]

Revision: 42936
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42936
Author:   campbellbarton
Date:     2011-12-28 14:28:56 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42931:42935

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

Property Changed:
----------------
    branches/bmesh/blender/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42931
   + /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42935