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)
1  2 
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

diff --cc CMakeLists.txt
Simple merge
Simple merge