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

List:       kmail-devel
Subject:    Re: kroupware_kaplan
From:       Stephan Kulow <coolo () kde ! org>
Date:       2002-11-29 11:15:25
[Download RAW message or body]

Am Friday 29 November 2002 11:30 schrieb Don Sanders:
> On Friday 29 November 2002 19:14, Marc Mutz wrote:
> > Hi Stephan!
> >
> > I'll be merging some stuff and from and to HEAD to and from
> > kroupware_branch in order to be able to open the kroupware_kaplan
> > branch from kroupware_branch where we'll port kroupware to kaplan,
> > resp. HEAD. Can you stop merging stuff from make_it_cool for the
> > next few hours for kmacct*, please?
>
> I would prefer it if you could please let Coolo complete the merging
> he has already begun, and give it a day or two for testing first
> thanks.

So far the changes Marc merged in resulted in only one conflict.
Merging three branches is definitly an interesting task - I just hope
that noone opens a third branch in changing even more stuff in either
HEAD or another branch :)

Greetings, Stephan

_______________________________________________
KMail Developers mailing list
kmail@mail.kde.org
http://mail.kde.org/mailman/listinfo/kmail
[prev in list] [next in list] [prev in thread] [next in thread]