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

List:       kopete-devel
Subject:    [Kopete-devel] kdenonbeta/kopete/libkopete
From:       kde-cvs () kde ! org
Date:       2002-05-17 21:01:32
[Download RAW message or body]


kdenonbeta/kopete/libkopete kopete.cpp,1.56,1.57 kopetecontact.cpp,1.5,1.6 \
kopetecontact.h,1.7,1.8 kopetemessage.cpp,1.5,1.6 kopetemessage.h,1.8,1.9 \
kopetemessagemanager.cpp,1.20,1.21 kopetemessagemanager.h,1.12,1.13 \
kopetemessagemanagerfactory.cpp,1.9,1.10 kopetemessagemanagerfactory.h,1.7,1.8 \
                messagelog.cpp,1.4,1.5 plugin.cpp,1.2,1.3 plugin.h,1.2,1.3
Author: mklingens
Fri May 17 23:01:32 CEST 2002
In directory office:/tmp/cvs-serv16986


Modified Files:
        kopete.cpp kopetecontact.cpp kopetecontact.h kopetemessage.cpp
        kopetemessage.h kopetemessagemanager.cpp
        kopetemessagemanager.h kopetemessagemanagerfactory.cpp
        kopetemessagemanagerfactory.h messagelog.cpp plugin.cpp
        plugin.h
Log Message:

Merging KMM_BRANCH back into HEAD. First step: libkopete.

Carsten's KopeteEditor class is preserved in favour of the clumsy hack
that was used in the branch to separate the single/multi-line edits.

Merge is based on CVS HEAD, with changes merged, so other bugfixes to
HEAD should be preserved as well, as cvs diff also seems to indicate.

Please test thoroughly once I complete my commit of the various plugins
in a few minutes. KMM branch is *DEAD* now! Approved by Nick, Andres and
Duncan, which should give me enough majority ;-)




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


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