X-ECN Telecoms-MailScanner-Information: Contact ECN Telecoms
X-ECN Telecoms-MailScanner: Found to be clean
X-ECN Telecoms-MailScanner-SpamCheck: not spam, SpamAssassin (not cached,
score=-103.966, required 6, autolearn=not spam, ALL_TRUSTED -1.80,
AWL 0.43, BAYES_00 -2.60, USER_IN_WHITELIST -100.00)
X-ECN Telecoms-MailScanner-From: [EMAIL PROTECTED]
X-Spam-Status: No
Sorry, I've just submitted a patch to fix that (revision 4609).
Bye
Damjan
On Mon, 2008-03-31 at 09:08 -0500, Jeffrey Ollie wrote:
> On Mon, Mar 31, 2008 at 9:02 AM, <[EMAIL PROTECTED]> wrote:
> >
> > Modified: callweaver/trunk/apps/app_t38gateway.c
> > ===================================================================
> > --- callweaver/trunk/apps/app_t38gateway.c 2008-03-31 13:50:36 UTC
> > (rev 4607)
> > +++ callweaver/trunk/apps/app_t38gateway.c 2008-03-31 14:02:01 UTC
> > (rev 4608)
> > @@ -361,7 +361,12 @@
> > {
> > clean_frame(f);
> > break;
> > +<<<<<<< .mine
> > }
> > +
> > +=======
> > + }
> > +>>>>>>> .r4440
> > samples = (f->samples <= MAX_BLOCK_SIZE) ?
> > f->samples : MAX_BLOCK_SIZE;
> >
> > if ((len = t38_gateway_tx(&t38_state, (int16_t *)
> > &buf[CW_FRIENDLY_OFFSET], samples)))
>
> Looks like some conflict markers got left in the commit.
>
> Jeff
> _______________________________________________
> Callweaver-dev mailing list
> [email protected]
> http://lists.callweaver.org/mailman/listinfo/callweaver-dev
_______________________________________________
Callweaver-dev mailing list
[email protected]
http://lists.callweaver.org/mailman/listinfo/callweaver-dev
