Merging r47535 through r47566 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 09:32:39 +0000 (09:32 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 09:32:39 +0000 (09:32 +0000)
1  2 
source/blender/blenkernel/BKE_node.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blenderplayer/CMakeLists.txt

Simple merge
Simple merge