Alec L Davis 30cfce07f7 fix bad edit after conflict resolution ...

........

Merged revisions 391107 from http://svn.asterisk.org/svn/asterisk/branches/1.8


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

2013-06-10 08:34:46 +00:00

..

h323

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

misdn

Allow mISDN to send PROGRESS messsage.

2013-05-10 22:11:12 +00:00

sip

chan_sip: Session-Expires: Set timer to correctly expire at (~2/3) of the interval when not the refresher

2013-05-02 08:09:59 +00:00

chan_agent.c

chan_agent: Prevent multiple channels from logging in as the same agent.

2013-01-29 17:54:17 +00:00

chan_alsa.c

Don't attempt to create a voice frame on a read error

2013-04-14 02:30:19 +00:00

chan_bridge.c

confbridge: Minor fixes playing user counts to the conference.

2013-01-22 00:35:34 +00:00

chan_console.c

Commit framework for HANGUPCAUSE (replacement for SIP_CAUSE)

2012-05-14 19:44:27 +00:00

chan_dahdi.c

chan_dahdi: fix lower bound check with -ve integer conversion from a float

2013-05-02 06:54:05 +00:00

chan_gtalk.c

Deprecate chan_gtalk, chan_jingle, and res_jabber

2012-09-10 19:48:22 +00:00

chan_h323.c

Commit framework for HANGUPCAUSE (replacement for SIP_CAUSE)

2012-05-14 19:44:27 +00:00

chan_iax2.c

fix bad edit after conflict resolution

2013-06-10 08:34:46 +00:00

chan_jingle.c

Set the sin_family on the bind address socket during initialization

2013-02-24 23:00:05 +00:00

chan_local.c

Prevent exhaustion of system resources through exploitation of event cache

2013-01-02 18:09:55 +00:00

chan_mgcp.c

Commit framework for HANGUPCAUSE (replacement for SIP_CAUSE)

2012-05-14 19:44:27 +00:00

chan_misdn.c

chan_misdn: Fix compile error.

2013-01-16 17:48:29 +00:00

chan_motif.c

Add missing support for "who hung up" to chan_motif.

2012-12-09 01:22:56 +00:00

chan_multicast_rtp.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

chan_nbs.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

chan_oss.c

Fix misuses of asprintf throughout the code.

2012-08-21 20:54:19 +00:00

chan_phone.c

Commit framework for HANGUPCAUSE (replacement for SIP_CAUSE)

2012-05-14 19:44:27 +00:00

chan_phone.h

rename DialTone.h to chan_phone.h because chan_phone.c is the only file using it

2008-05-28 20:00:21 +00:00

chan_sip.c

Fix Crash Caused By One-way Audio With auto_* NAT Settings Fix

2013-05-13 21:05:38 +00:00

chan_skinny.c

Fix reload skinny with active devices.

2013-02-06 08:42:09 +00:00

chan_unistim.c

Fix several problems caused by multiple line usage with i2004 phones.

2013-05-24 10:12:01 +00:00

chan_vpb.cc

Commit framework for HANGUPCAUSE (replacement for SIP_CAUSE)

2012-05-14 19:44:27 +00:00

console_board.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

console_gui.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

console_video.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

iax2-parser.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

iax2-parser.h

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

iax2-provision.c

iax2-provision: Fix improper return on failed cache retrieval

2012-09-21 19:29:12 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Correct the number of available call numbers in IAX2.

2013-01-28 21:08:04 +00:00

Makefile

Extract sig_ss7 out of chan_dahdi.

2010-06-07 20:04:42 +00:00

misdn_config.c

Add named callgroups/pickupgroups

2012-08-07 12:46:36 +00:00

sig_analog.c

Multiple revisions 375993-375994

2012-11-07 19:03:42 +00:00

sig_analog.h

Convert sig_analog to use a global callback table.

2012-08-08 20:32:53 +00:00

sig_pri.c

chan_dahdi: Add inband_on_proceeding compatibility option.

2013-04-03 20:18:32 +00:00

sig_pri.h

chan_dahdi: Add inband_on_proceeding compatibility option.

2013-04-03 20:18:32 +00:00

sig_ss7.c

chan_dahdi/SS7: Made reject incoming call for an in-alarm or blocked channel.

2012-11-08 21:10:47 +00:00

sig_ss7.h

Convert sig_ss7 to use a global callback table.

2012-08-08 00:15:54 +00:00

vcodecs.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

vgrabbers.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00