From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel =?utf-8?q?Weism=C3=BCller?= To: development@lists.ipfire.org Subject: Re: merge request for the new vdr-addon vnsi-server5 Date: Fri, 30 May 2014 15:34:02 +0200 Message-ID: <538888CA.8020805@ipfire.org> In-Reply-To: <1401453118.19068.35.camel@rice-oxley.tremer.info> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0346804456398861182==" List-Id: --===============0346804456398861182== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sorry my fault... ... the files are uploaded to git.ipfire.org/pub/source/source-2.x/ - Daniel Am 30.05.2014 14:31, schrieb Michael Tremer: > 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=C3=BCller wrote: >>> Hi >>> I've build an new vdr-addon called vnsi-server5. >>> >>> http://git.ipfire.org/?p=3Dpeople/dweismueller/ipfire-2.x.git;a=3Dshortlo= g;h=3Drefs/heads/vdr_vnsiserver5_new >>> >>> >>> It has the equal functions like vnsi-server3 but the vnsi-server3 only >>> communicates with xbmc <=3D v12 and the vnsi-server5 >=3D v13. >>> >>> see here : http://forum.xbmc.org/showthread.php?tid=3D153801 >>> >>> 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 --===============0346804456398861182==--