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)
commitf141b5949711fd92928e8b764340dc5a2e6ff2c9
tree25dd64b6f0c25f18100c81975e53e9b170bb242e
parent7ece1ef63e06b65df7d2195711a6829de3c74a67
parent228be107221c0e25c06626b1019802ffee797cdc
Merging r37952 through r38022 from trunk into soc-2011-tomato
CMakeLists.txt
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_edit.c
source/creator/CMakeLists.txt