[MPlayer-cvslog] r19341 - in trunk/stream: Makefile asf_mmst_streaming.c asf_streaming.c network.c network.h pnm.c stream_ftp.c stream_netstream.c stream_rtsp.c stream_vstream.c tcp.c tcp.h

[Reimar Döffinger]

Hello,
On Fri, Aug 11, 2006 at 03:58:55PM +0200, Diego Biurrun wrote:
> On Fri, Aug 11, 2006 at 03:54:18PM +0200, Dominik 'Rathann' Mierzejewski wrote:
> > On Friday, 11 August 2006 at 15:49, Diego Biurrun wrote:
> > > IMO 'svn merge' is the correct solution here.
> > 
> > Are you going to do it, then?
> 
> No, this is up to Benjamin.

So will someone actually do something at all about this? Like, at least
explaining what exactly the solution is supposed to be? Or are we
waiting for things to fix themselves magically?

Greetings,
Reimar Döffinger