Campbell Barton ea36d4eb22 svn merge ^/trunk/blender -r42953:42957

2011-12-29 01:58:47 +00:00

..

modules

svn merge ^/trunk/blender -r42920:42927

2011-12-28 13:33:35 +00:00

presets

svn merge ^/trunk/blender -r42920:42927

2011-12-28 13:33:35 +00:00

startup

svn merge ^/trunk/blender -r42953:42957

2011-12-29 01:58:47 +00:00

templates

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00