phonon/solid merge

[Branan Riley]

I tend to update sunday evenings so I get the new stuff after it's
been cleaned up over the week. I'm sure I'm not the only one who does
that, so make sure to inform everyone in big, bold letters.

On 4/24/07, Matthias Kretz <kretz at kde.org> wrote:
> On Tuesday 24 April 2007, Dirk Mueller wrote:
> > The options are to merge this branch before (perhaps over the weekend), or
> > to shift the alpha1 tag a few days (wednesday imho).
> >
> > I would suggest the latter, any comments?
>
> I'd also prefer to merge the branch on monday. If on the weekend, that's fine
> with me as well - but then I won't be available to do the "no fun" svn
> merging work.
>
> --
> ________________________________________________________
> Matthias Kretz (Germany)                            <><
> http://Vir.homelinux.org/
> MatthiasKretz at gmx.net, kretz at kde.org,
> Matthias.Kretz at urz.uni-heidelberg.de
>