Merging r48992 through r48995 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 17 Jul 2012 10:46:32 +0000 (10:46 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 17 Jul 2012 10:46:32 +0000 (10:46 +0000)
1  2 
source/blender/blenkernel/intern/mask.c
source/blender/editors/space_node/node_draw.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_init_exit.c