Campbell Barton 4ced91da47 svn merge ^/trunk/blender -r42778:42839		2011-12-23 08:41:53 +00:00
..
modules	svn merge ^/trunk/blender -r42778:42839	2011-12-23 08:41:53 +00:00
presets	svn merge ^/trunk/blender -r42466:42495	2011-12-07 18:29:21 +00:00
startup	svn merge ^/trunk/blender -r42778:42839	2011-12-23 08:41:53 +00:00
templates	rename user interface operator properties from 'op' to 'props'	2011-10-23 00:53:50 +00:00