Horrible merge...

[Boudewijn Rempt]

And krita/core compiles -- but there are a few things that need attention as 
soon as possible after checking:

* high-level iterators (all bodies commented out, I didn't know what to here)
* gradients
* the oilify, scale, rotate, sheer and raindrop visitors

I'll tag cvs before committing :-).

-- 
Boudewijn Rempt 
http://www.valdyas.org/fading/index.cgi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kimageshop/attachments/20050108/4d1b7af2/attachment.pgp