svn merge -r38718:38804 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jul 2011 02:03:53 +0000 (02:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jul 2011 02:03:53 +0000 (02:03 +0000)
commit73dde4e26f949af64d9a95283525201f91feee11
tree95b08b4382be5cdd5e8a650d8ae7e686db58cd35
parent42b87af8a713a0ddc47a0ebacafd43743952aa96
parent26589497529ca3c8da85391d4976d286a371e258
svn merge -r38718:38804 https://svn.blender.org/svnroot/bf-blender/trunk/blender
19 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/multires.c
source/blender/editors/armature/editarmature.c
source/blender/editors/object/object_add.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_snap.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c