[MPlayer-dev-eng] Zattoo new version

[Diego Biurrun]

On Mon, Apr 09, 2007 at 12:31:08PM +0200, Vladimir Serbinenko wrote:
> Zattoo made some minor modifications in their protocol. I send now new
> version of patch. More coments in next mail
> --- stream/Makefile	(r??vision 22949)
> +++ stream/Makefile	(copie de travail)
> @@ -18,6 +18,32 @@
> +<<<<<<< .mine

WTF?

You had a conflict when Subversion merged files and you didn't even
notice?  Same below, btw ...

Diego