[Pkg-kde-talk] svn merging to trunk (initially: svn merging hell)

[Christopher Martin]

On January 6, 2005 09:20, Adeodato Sim=F3 wrote:
> Hi all,
>
>   now that (it seems) all 3.3.1 uploads are done, it may be time to get
>   3.3.2 packaging back in /trunk (instead of /branches/kde-3.3.2).

Yup.

>     So, I have all this uncommited, waiting from comments. I merged
>     changelog entries in version order; I would have liked to use
>     upload-order, but that would break dpkg-genchanges.

The diff looks fine to me.

Chris