From kopete-devel  Sat May 25 09:53:37 2002
From: Martijn Klingens <klingens () kde ! org>
Date: Sat, 25 May 2002 09:53:37 +0000
To: kopete-devel
Subject: Re: [Kopete-devel] irc
X-MARC-Message: https://marc.info/?l=kopete-devel&m=102232027215758

On Saturday 25 May 2002 04:31, Nick Betcher wrote:
> I thought I fixed that. Was KOPETE_KMM_BRANCH properly merged with HEAD?

I got one conflict, and you helped me solve that one on IRC. Not knowing the 
code I didn't look too closely at the diff, but I didn't see anything scary 
either.

Martijn

_______________________________________________
Kopete-devel mailing list
Kopete-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/kopete-devel