svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 05:04:01 +0000 (05:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 05:04:01 +0000 (05:04 +0000)
commitef18ec335ff8496d1a047615073c7258eeffa371
tree0da45af24c4b9f4055390a9640bf0d59613605bc
parent17e88915fdd7048365df1be48d615d69c0924b4c
parent50277c48ba5bf9eae418453159e421489895dafd
svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
13 files changed:
build_files/scons/config/darwin-config.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_userdef.c