Merging r37437 through r37478 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 14 Jun 2011 16:08:39 +0000 (16:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 14 Jun 2011 16:08:39 +0000 (16:08 +0000)
1  2 
CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/transform/transform_generics.c

diff --cc CMakeLists.txt
Simple merge