Campbell Barton 5380545c97 svn merge ^/trunk/blender -r42221:42245		2011-11-29 06:58:16 +00:00
..
modules	svn merge ^/trunk/blender -r42172:42182	2011-11-27 01:42:56 +00:00
presets	svn merge ^/trunk/blender -r42197:42221	2011-11-28 17:09:13 +00:00
startup	svn merge ^/trunk/blender -r42221:42245	2011-11-29 06:58:16 +00:00
templates	rename user interface operator properties from 'op' to 'props'	2011-10-23 00:53:50 +00:00