Merging r38036 through r38196 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jul 2011 17:48:22 +0000 (17:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jul 2011 17:48:22 +0000 (17:48 +0000)
1  2 
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_scene_types.h
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge