Campbell Barton 5c22d9f916 svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merged manually		2011-09-03 12:39:17 +00:00
..
modules	svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merged manually	2011-09-03 12:39:17 +00:00
presets	svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c	2011-09-01 00:35:30 +00:00
startup	svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-03 02:49:21 +00:00
templates	pep8 edits and change '!= None' to 'is not None'	2011-08-22 09:01:49 +00:00