Horrible merge...

[Boudewijn Rempt]

KisPaintDevice now compiles, but I've had to comment out all the iterator 
stuff since I couldn't get them to merge properly. 
-- 
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/68c9fd84/attachment.pgp