Russell Bryant f5d4a16cda Merged revisions 61799 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61799 | russell | 2007-04-25 11:22:07 -0500 (Wed, 25 Apr 2007) | 11 lines

Merged revisions 61798 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61798 | russell | 2007-04-25 11:20:38 -0500 (Wed, 25 Apr 2007) | 3 lines

Fix a typo where cid_num got copied instead of cid_ani.  
(issue #9587, reported and patched by xrg)

........

................


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

2007-04-25 16:23:00 +00:00

..

h323

Merged revisions 53131 via svnmerge from

2007-02-03 10:12:20 +00:00

misdn

Merged revisions 61342,61372-61373,61443 via svnmerge from

2007-04-11 15:48:54 +00:00

answer.h

…

chan_agent.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_alsa.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_features.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_gtalk.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_h323.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_iax2.c

Merge changes from team/russell/iax2_osp

2007-04-20 21:12:53 +00:00

chan_jingle.c

updated ast_channel_alloc() call to include the 4 extra args everyone got. Not much info there, as the config file evidently does not allow amaflags, or accountcode settings; and the pvt's exten doesn't sound like what we need in the cdr, either.

2007-04-10 16:07:10 +00:00

chan_local.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_mgcp.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_misdn.c

Merged revisions 61342,61372-61373,61443 via svnmerge from

2007-04-11 15:48:54 +00:00

chan_nbs.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_oss.c

Merged revisions 61644 via svnmerge from

2007-04-13 17:11:53 +00:00

chan_phone.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_sip.c

Merged revisions 61772 via svnmerge from

2007-04-24 16:10:10 +00:00

chan_skinny.c

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_vpb.cc

Merged revisions 60989 via svnmerge from

2007-04-10 05:41:34 +00:00

chan_zap.c

Merged revisions 61799 via svnmerge from

2007-04-25 16:23:00 +00:00

DialTone.h

…

gentone-ulaw.c

…

gentone.c

…

iax2-parser.c

Merge changes from team/russell/iax2_osp

2007-04-20 21:12:53 +00:00

iax2-parser.h

Merge changes from team/russell/iax2_osp

2007-04-20 21:12:53 +00:00

iax2-provision.c

Constify a bunch of usage strings for CLI commands.

2006-12-06 07:35:31 +00:00

iax2-provision.h

useless 'extern' and trailing whitespace removal

2006-03-31 10:11:10 +00:00

iax2.h

Merge changes from team/russell/iax2_osp

2007-04-20 21:12:53 +00:00

Makefile

Merged revisions 51615 via svnmerge from

2007-01-23 06:56:26 +00:00

misdn_config.c

Merged revisions 61183 via svnmerge from

2007-04-10 12:47:57 +00:00

ring10.h

…