Merging r38265 through r38295 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jul 2011 08:43:34 +0000 (08:43 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jul 2011 08:43:34 +0000 (08:43 +0000)
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/depsgraph.c
source/blender/editors/transform/transform_conversions.c
source/creator/creator.c

diff --cc CMakeLists.txt
Simple merge
Simple merge