From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: merge request for the new vdr-addon vnsi-server5
Date: Fri, 30 May 2014 14:31:58 +0200 [thread overview]
Message-ID: <1401453118.19068.35.camel@rice-oxley.tremer.info> (raw)
In-Reply-To: <1401449514.19068.28.camel@rice-oxley.tremer.info>
[-- Attachment #1: Type: text/plain, Size: 1475 bytes --]
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
next prev parent reply other threads:[~2014-05-30 12:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 14:21 Daniel Weismüller
2014-05-30 11:31 ` Michael Tremer
2014-05-30 12:31 ` Michael Tremer [this message]
2014-05-30 13:34 ` Daniel Weismüller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401453118.19068.35.camel@rice-oxley.tremer.info \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox