PROPOSAL: Moving the KDEPIM Enterprise Branch into the 3.5 Branch

[Dirk Mueller]

On Thursday 11 October 2007, David Faure wrote:

> AFAIK my colleagues have set up svnmerge and kept an eye on changes,
> but still it might be a good idea to make sure we're not overwriting a
> bugfix.

I agree. merging sounds safer, even though it screws up annotate. the two 
branches diverged quite far though, so its a lot of work. 

> I support the idea of course, I'm just wondering about those small details.
> Another "small detail" would be: checking with the translators that they
> are OK with all those new strings appearing in the 3.5 branch - so close to
> the release.

I guess they're more happy of having a kmail release that *can* be translated 
over one that is totally untranslated. 


Dirk