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

List:       kde-commits
Subject:    KDE/kdepim/kpilot
From:       Jason vanRijn Kasper <vR () movingparts ! net>
Date:       2009-03-16 2:22:14
Message-ID: 1237170134.287832.25309.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 939937 by vanrijn:

Okay, we've been doing all of our stabilization and work in
branches/KDE/4.2/kdepim/kpilot, and I've intentionally been holding off on
merging back into trunk (I haven't forgotten =;P) to minimize confusion, but now
seems a good time to do so. This merge brought to you by "svn merge
-r906316:939936 https://svn.kde.org/home/kde/branches/KDE/4.2/kdepim/kpilot ."
and the letter "Z".



 M  +2 -1      AUTHORS  
 M  +1 -1      conduits/akonadibase/akonadi-setup-widget.ui  
 M  +52 -25    conduits/akonadibase/akonadidataproxy.cc  
 M  +29 -3     conduits/akonadibase/akonadirecord.cc  
 M  +18 -0     conduits/akonadibase/akonadirecord.h  
 M  +7 -6      conduits/akonadibase/akonadisetupwidget.cc  
 M  +30 -6     conduits/akonadibase/collectioncombobox.cc  
 M  +59 -56    conduits/base/dataproxy.cc  
 M             conduits/base/design/Use_Case_-_Conduit_Syncing.odt  
 M  +4 -13     conduits/base/hhdataproxy.cc  
 M  +1 -0      conduits/base/hhdataproxy.h  
 M  +26 -10    conduits/base/hhrecord.cc  
 M  +2 -1      conduits/base/hhrecord.h  
 M  +7 -0      conduits/base/idmapping.cc  
 M  +5 -0      conduits/base/idmapping.h  
 M  +29 -4     conduits/base/idmappingxmlsource.cc  
 M  +3 -1      conduits/base/idmappingxmlsource.h  
 M  +5 -0      conduits/base/record.h  
 M  +135 -45   conduits/base/recordconduit.cc  
 M  +5 -0      conduits/base/recordconduit.h  
 M  +4 -3      conduits/base/tests/rcfullsynchhtest.cc  
 M  +4 -3      conduits/base/tests/rchotsynchhtest.cc  
 M  +5 -5      conduits/calendar/CMakeLists.txt  
 M  +1 -1      conduits/calendar/calendarakonadiproxy.h  
 M  +18 -0     conduits/calendar/calendarakonadirecord.cc  
 M  +5 -0      conduits/calendar/calendarakonadirecord.h  
 M  +83 -10    conduits/calendar/calendarconduit.cc  
 M  +5 -0      conduits/calendar/calendarconduit.h  
 M  +6 -6      conduits/calendar/calendarconfig.cc  
 M  +1 -1      conduits/calendar/calendarconfig.h  
 M  +1 -1      conduits/calendar/calendarfactory.cc  
 M  +4 -1      conduits/calendar/calendarhhrecord.cc  
 M  +3 -0      conduits/calendar/calendarsettings.kcfg  
 M  +3 -0      conduits/contacts/contactsakonadirecord.cc  
 M  +18 -1     conduits/contacts/contactsconduit.cc  
 M  +5 -0      conduits/contacts/contactsconduit.h  
 M  +3 -0      conduits/contacts/contactssettings.kcfg  
 M  +4 -1      conduits/contacts/settingswidget.ui  
 M  +5 -4      conduits/todo/CMakeLists.txt  
 M  +14 -1     conduits/todo/todoakonadirecord.cc  
 M  +83 -11    conduits/todo/todoconduit.cc  
 M  +5 -0      conduits/todo/todoconduit.h  
 M  +2 -2      conduits/todo/todofactory.cc  
 M  +10 -1     conduits/todo/todohhrecord.cc  
 M  +6 -0      conduits/todo/todohhrecord.h  
 M  +3 -0      conduits/todo/todosettings.kcfg  
 M  +11 -3     kpilot/hotSync.cc  
 M  +1 -2      kpilot/kpilot.cc  
 M  +10 -5     kpilot/kpilotConfig.cc  
 M  +4 -2      kpilot/pilotDaemon.cc  
 M  +35 -45    lib/kpilotdevicelink.cc  
 M  +0 -1      lib/kpilotdevicelinkPrivate.h  
 M  +5 -11     lib/kpilotlink.cc  
 M  +3 -18     lib/options.cc  
 M  +1 -1      lib/options.h  
 M  +1 -0      lib/pilot.cc  
 M  +4 -1      lib/pilotRecord.cc  
 M  +1 -1      lib/plugin.h  
 M  +1 -0      lib/syncAction.cc  


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