svn merge ^/trunk/blender -r40394:40395
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 10:43:25 +0000 (10:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 10:43:25 +0000 (10:43 +0000)
commit460cde345bd7779f7dc011b7154c7497be46d799
tree36e29196b072abba9027327ac87cf881b03faa32
parentd92b5ea04ac8b661bb8caa7a1ca813e8f33a5a1c
parentf0aac81466bb5b3a935d74d3a35b545002b0451b
svn merge ^/trunk/blender -r40394:40395
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/blenlib/BLI_fileops.h
source/blender/editors/armature/SConscript
source/blender/editors/space_buttons/SConscript
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/transform/SConscript
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/windowmanager/SConscript
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt