Campbell Barton ca662d0fd6 svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender		2011-09-12 00:38:57 +00:00
..
modules	svn merge -r40034:40051 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-09 02:29:44 +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 -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-12 00:38:57 +00:00
templates	pep8 edits and change '!= None' to 'is not None'	2011-08-22 09:01:49 +00:00