The merge has been reverted because of missing sources on the server.

Guys, this cannot happen any more. Literally every single merge request
that pulls in source tarballs lacks the files on the server. I will
ignore those merge requests in the future without any further notice.

-Michael

On Fri, 2014-05-30 at 13:31 +0200, Michael Tremer wrote:
> Hi,
> 
> I merged this branch although it had merge conflicts with next.
> 
> It would have made a bit more sense to build this vdr plugin with all
> the other plugins, but any way... Merged.
> 
> -Michael
> 
> On Tue, 2014-05-27 at 16:21 +0200, Daniel Weismüller wrote:
> > Hi
> > I've build an new vdr-addon called vnsi-server5.
> > 
> > http://git.ipfire.org/?p=people/dweismueller/ipfire-2.x.git;a=shortlog;h=refs/heads/vdr_vnsiserver5_new
> > 
> > 
> > It has the equal functions like vnsi-server3 but the vnsi-server3 only 
> > communicates with xbmc <= v12 and the vnsi-server5 >= v13.
> > 
> > see here : http://forum.xbmc.org/showthread.php?tid=153801
> > 
> > Could some please review?
> > 
> > Thanks.
> > 
> > -Daniel
> > 
> > _______________________________________________
> > Development mailing list
> > Development(a)lists.ipfire.org
> > http://lists.ipfire.org/mailman/listinfo/development
> 
> _______________________________________________
> Development mailing list
> Development(a)lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/development