Campbell Barton 705f23064e svn merge ^/trunk/blender -r43294:43338		2012-01-13 01:39:57 +00:00
..
modules	svn merge ^/trunk/blender -r43220:43278 --accept postpone	2012-01-11 14:14:04 +00:00
presets	svn merge ^/trunk/blender -r42991:43009	2011-12-31 03:07:14 +00:00
startup	svn merge ^/trunk/blender -r43294:43338	2012-01-13 01:39:57 +00:00
templates	rename user interface operator properties from 'op' to 'props'	2011-10-23 00:53:50 +00:00