Campbell Barton a32f572f89 svn merge ^/trunk/blender -r46629:46632

2012-05-14 14:55:10 +00:00

..

modules

Merging r46469 through r46494 from trunk into soc-2011-tomato

2012-05-10 11:20:15 +00:00

presets

Camera tracking: apparently one of tracking presets was never merged from tomato

2012-05-03 17:00:08 +00:00

startup

svn merge ^/trunk/blender -r46629:46632

2012-05-14 14:55:10 +00:00

templates

fix for modal timer template, wasnt updated for changes to themes.

2012-04-27 10:00:21 +00:00