Merging r37952 through r38022 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 1 Jul 2011 16:39:13 +0000 (16:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 1 Jul 2011 16:39:13 +0000 (16:39 +0000)
1  2 
CMakeLists.txt
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_edit.c
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge