Campbell Barton 7553440aa4 svn merge ^/trunk/blender -r42172:42182		2011-11-27 01:42:56 +00:00
..
modules	svn merge ^/trunk/blender -r42172:42182	2011-11-27 01:42:56 +00:00
presets	svn merge ^/trunk/blender -r42116:42139	2011-11-24 20:01:45 +00:00
startup	svn merge ^/trunk/blender -r42139:42172	2011-11-26 16:29:14 +00:00
templates	rename user interface operator properties from 'op' to 'props'	2011-10-23 00:53:50 +00:00