Campbell Barton e59ab6486f svn merge -r41751:41779 ^/trunk/blender		2011-11-15 02:05:32 +00:00
..
modules	svn merge ^/trunk/blender -r41602:41638 .	2011-11-08 02:57:28 +00:00
presets	svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build	2011-11-10 04:17:43 +00:00
startup	svn merge -r41751:41779 ^/trunk/blender	2011-11-15 02:05:32 +00:00
templates	rename user interface operator properties from 'op' to 'props'	2011-10-23 00:53:50 +00:00