Merging r38898 through r38940 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 2 Aug 2011 17:32:19 +0000 (17:32 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 2 Aug 2011 17:32:19 +0000 (17:32 +0000)
commit1694e5978a6e30d95791b5fab2a97524ff6f00e1
tree2c21f0e7a128f5c9d8c2714eb3ff6ca6ca98f9f7
parentb5716beef0c1c8ddd524e43aef182c3d7e651aba
parent9026dc6ee4b16f9a9db73eee09f2f397012268d2
Merging r38898 through r38940 from trunk into soc-2011-tomato
14 files changed:
CMakeLists.txt
build_files/scons/tools/btools.py
release/scripts/startup/bl_ui/space_userpref_keymap.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/interface/resources.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_operators.c