Horrible merge...

[Boudewijn Rempt]

On Saturday 08 January 2005 14:09, Boudewijn Rempt wrote:
> Whether I merge autolayers into HEAD or HEAD into autolayers doesn't matter
> -- it's a pretty horrible merge, as was to be expected... I'm working on
> finding something easier to do, such as a diff between HEAD on 17 december
> and autolayers now and a manual apply. Shouldn't have been so pusilanimous
> with add tags to CVS, I guess.
>

Okay... No conflicts anymore. Let's fire up the compiler.

-- 
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/072851f2/attachment.pgp