Campbell Barton 3debc930e8 svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender/release --accept theirs-full

2011-09-08 07:23:01 +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 -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender/release --accept theirs-full

2011-09-08 07:23:01 +00:00

templates

pep8 edits and change '!= None' to 'is not None'

2011-08-22 09:01:49 +00:00