Merging kroupware branch into kdepim (mainly korganizer)

This report was contributed by by Cornelius Schumacher


Steffen, Lutz, Günter and Cornelius discussed how to finish the merge of the kroupware branch into the HEAD branch. There is still missing the Free/Busy handling, the configuration, changes to the attendee tab of the todo editor and some minor things.

We agreed on the details how to proceed with the merge (see below). To get all the functionality into the HEAD branch we can temporarily merge the kokroupware file and resolve the remaining isssues in the HEAD branch.

The kroupware developers will send patches. As the HEAD branch is diverging quickly from the 3.1 and the kroupware branch it will be less work, if the merge is done as soon as possible.

Details:


| back to meeting overview |