[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-kimageshop
Subject:    merge conflicts
From:       Matthias Elter <me () main-echo ! net>
Date:       1999-08-06 19:13:22
[Download RAW message or body]

Hi

I have just checked in some major changes and had ugly merge conflicts
with Michaels code. I'm going to recomplie now to see if something
broke.

To avoid such conflicts here is what I plan to work on the next few
days:

- extend the brush class to load/save brushes
- color selction buttons (foreground/background) and color dialog
- extend brush tool to use foreground color
- implement pen tool
- paint on/move linked layers


Greetings, Matthias

--
Matthias Elter
me@kde.org / me@main-echo.net
KDE developer

[prev in list] [next in list] [prev in thread] [next in thread]