[Kde-pim] Merging komo branch -> trunk

[Volker Krause]

On Monday 05 July 2010 22:03:57 Volker Krause wrote:
> I started merging the komo work branch back into trunk now that 4.5 has
> been branched. This will take a bit if done in a way that does minimal
> damage to the history and ensures that nothing gets lost at the same time.
> Most of the smaller changes are done by now, the following three bigger
> chunks are still work in progress:
>
> kdepim/incidenceeditors
> kdepim/runtime/qml
> kdepim/mobile
>
> Please coordinate any commits into those places as well as anywhere into
> komo/kdepim with me until further notice, to avoid unnecessary conflicts.

done, from now on all new development should happen in trunk again, 
komo/kdepim will be deleted shortly.

regards
Volker
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20100707/e46865a9/attachment.sig>
-------------- next part --------------
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/