svn merge -r48944:48942 .
authorCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jul 2012 16:57:21 +0000 (16:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jul 2012 16:57:21 +0000 (16:57 +0000)
commit8c77b35f4f0cbd75187b7f888429a57d59d00eeb
treedb5571473c44a900f38f343173bc1bb51cbe6be3
parent701a16c9dd67fed0f3ab814d946b6036f3a037b8
svn merge -r48944:48942 .

revert moving the file, adding a new module didnt resolve linking issue.
source/blender/blenkernel/intern/mask_rasterize.c [moved from source/blender/maskraster/maskraster.c with 100% similarity]