Merging r39135 through r39172 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Aug 2011 07:14:59 +0000 (07:14 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Aug 2011 07:14:59 +0000 (07:14 +0000)
commitb49d6a6f60c8075abf9011bdca2e6c1dd4f78a8b
tree2de5ee449a3b492dcad01b3632e61eb5fa3e6c2a
parentcc2df8bfee1cb97ac9e822f742ea6eff8e4e01be
parent8eec116d0e752a02f664364aa062b23843d2d05a
Merging r39135 through r39172 from trunk into soc-2011-tomato
CMakeLists.txt
build_files/scons/tools/btools.py
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/WM_types.h