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)
commitc415a01fea783d03780edeecf5107a7b1b198d2f
treea4354b3204a7d2aa3df50ff87fe96bc8408db049
parent43fede95199399c79704ade56f9b6a4335b21946
parente35d3083ecce72ad01fa63977355beb0c7a5ff68
Merging r48992 through r48995 from trunk into soc-2011-tomato
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