Mark Michelson 660bceff3c Merged revisions 200361 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
  r200361 | mmichelson | 2009-06-12 14:07:51 -0500 (Fri, 12 Jun 2009) | 16 lines
  
  Merged revisions 200360 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r200360 | mmichelson | 2009-06-12 14:06:41 -0500 (Fri, 12 Jun 2009) | 10 lines
    
    Suppress a warning message and give a better return code when generating
    inband ringing after a call is answered.
    
    (closes issue #15158)
    Reported by: madkins
    Patches:
          15158.patch uploaded by mmichelson (license 60)
    Tested by: madkins
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200362 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-06-12 19:08:15 +00:00

..

db1-ast

Merged revisions 189419 via svnmerge from

2009-04-20 19:37:29 +00:00

editline

Merged revisions 179396 via svnmerge from

2009-03-02 20:17:55 +00:00

stdtime

Merged revisions 157974 via svnmerge from

2008-11-20 00:12:32 +00:00

abstract_jb.c

…

acl.c

…

adsistub.c

…

aescrypt.c

…

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

…

app.c

Merged revisions 190057 via svnmerge from

2009-04-22 21:17:29 +00:00

ast_expr2.c

Merged revisions 179973 via svnmerge from

2009-03-03 23:26:54 +00:00

ast_expr2.fl

Merged revisions 179973 via svnmerge from

2009-03-03 23:26:54 +00:00

ast_expr2.h

Merged revisions 179973 via svnmerge from

2009-03-03 23:26:54 +00:00

ast_expr2.y

Merged revisions 179973 via svnmerge from

2009-03-03 23:26:54 +00:00

ast_expr2f.c

Merged revisions 179973 via svnmerge from

2009-03-03 23:26:54 +00:00

asterisk.c

Merged revisions 199051 via svnmerge from

2009-06-04 14:53:49 +00:00

astfd.c

Merged revisions 187302 via svnmerge from

2009-04-09 05:16:06 +00:00

astmm.c

Merged revisions 144949-144951 via svnmerge from

2008-09-27 16:36:39 +00:00

astobj2.c

Merged revisions 175121 via svnmerge from

2009-02-12 16:33:24 +00:00

audiohook.c

Merged revisions 197543 via svnmerge from

2009-05-28 15:03:55 +00:00

autoservice.c

Merged revisions 163449 via svnmerge from

2008-12-12 14:05:01 +00:00

buildinfo.c

…

callerid.c

Merged revisions 180195 via svnmerge from

2009-03-04 19:25:59 +00:00

cdr.c

Merged revisions 198072 via svnmerge from

2009-05-29 19:13:03 +00:00

channel.c

Merged revisions 200361 via svnmerge from

2009-06-12 19:08:15 +00:00

chanvars.c

…

cli.c

Merged revisions 190057 via svnmerge from

2009-04-22 21:17:29 +00:00

config.c

Merged revisions 189629 via svnmerge from

2009-04-21 14:52:54 +00:00

cryptostub.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:25:31 +00:00

cygload.c

…

db.c

Merged revisions 182450 via svnmerge from

2009-03-17 05:53:17 +00:00

devicestate.c

…

dial.c

…

dns.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

dnsmgr.c

…

dsp.c

…

ecdisa.h

…

enum.c

Merged revisions 180534 via svnmerge from

2009-03-06 17:28:52 +00:00

event.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

features.c

Merged revisions 198856 via svnmerge from

2009-06-03 15:27:30 +00:00

file.c

Merged revisions 188585 via svnmerge from

2009-04-15 20:19:02 +00:00

fixedjitterbuf.c

…

fixedjitterbuf.h

…

frame.c

Merged revisions 195207 via svnmerge from

2009-05-18 15:54:26 +00:00

fskmodem_float.c

…

fskmodem_int.c

…

fskmodem.c

…

global_datastores.c

Merged revisions 172580 via svnmerge from

2009-01-30 23:58:31 +00:00

hashtab.c

…

http.c

Merged revisions 183865 via svnmerge from

2009-03-23 23:29:51 +00:00

image.c

…

indications.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:27:54 +00:00

io.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:24:27 +00:00

jitterbuf.c

Merged revisions 174584 via svnmerge from

2009-02-10 18:19:45 +00:00

loader.c

Merged revisions 199051 via svnmerge from

2009-06-04 14:53:49 +00:00

logger.c

Merged revisions 193194 via svnmerge from

2009-05-08 14:09:05 +00:00

Makefile

Merged revisions 187302 via svnmerge from

2009-04-09 05:16:06 +00:00

manager.c

Merged revisions 195369 via svnmerge from

2009-05-18 21:37:00 +00:00

md5.c

…

netsock.c

…

pbx.c

Fixes the argument order in definition of new_find_extension().

2009-06-10 20:29:52 +00:00

plc.c

…

poll.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:24:27 +00:00

privacy.c

…

rtp.c

Merged revisions 197606 via svnmerge from

2009-05-28 15:34:48 +00:00

say.c

Merged revisions 169794 via svnmerge from

2009-01-21 22:11:11 +00:00

sched.c

Merged revisions 142355 via svnmerge from

2008-09-10 16:42:32 +00:00

sha1.c

…

slinfactory.c

Merged revisions 171622 via svnmerge from

2009-01-27 20:13:17 +00:00

srv.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

strcompat.c

…

tcptls.c

Merged revisions 173458 via svnmerge from

2009-02-04 18:55:32 +00:00

tdd.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:25:31 +00:00

term.c

…

threadstorage.c

Merged revisions 164737 via svnmerge from

2008-12-16 17:15:43 +00:00

translate.c

Merged revisions 181731 via svnmerge from

2009-03-12 17:58:25 +00:00

udptl.c

Merged revisions 175334 via svnmerge from

2009-02-12 21:27:58 +00:00

ulaw.c

…

utils.c

Merged revisions 197538 via svnmerge from

2009-05-28 14:52:39 +00:00