Merging r37518 through r37593 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 17 Jun 2011 14:41:44 +0000 (14:41 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 17 Jun 2011 14:41:44 +0000 (14:41 +0000)
13 files changed:
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c

diff --cc CMakeLists.txt
Simple merge
Simple merge