Campbell Barton 7eadd540d4 svn merge ^/trunk/blender -r40872:40890		2011-10-13 22:50:01 +00:00
..
modules	svn merge ^/trunk/blender -r40720:40872	2011-10-09 07:31:15 +00:00
presets	svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-07 15:34:04 +00:00
startup	svn merge ^/trunk/blender -r40872:40890	2011-10-13 22:50:01 +00:00
templates	i18n: more clean-up	2011-09-19 15:28:43 +00:00