Mark Michelson 21dd185512 Fix bad merge from fix for issue 13867. ...

(closes issue #14686)
Reported by: davidw




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

2009-04-08 00:01:49 +00:00

..

h323

Fix build error when chan_h323 is not being built.

2009-03-30 13:55:44 +00:00

misdn

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

xpmr

Merged revisions 159025 via svnmerge from

2008-11-25 05:02:11 +00:00

chan_agent.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_alsa.c

Merged revisions 182810 via svnmerge from

2009-03-18 02:28:55 +00:00

chan_bridge.c

Merge in the RTP engine API.

2009-04-02 17:20:52 +00:00

chan_console.c

This is basically a complete rollback of r155401, as it was determined that

2008-11-25 01:01:49 +00:00

chan_dahdi.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_gtalk.c

Merge in the RTP engine API.

2009-04-02 17:20:52 +00:00

chan_h323.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_iax2.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_jingle.c

Merge in the RTP engine API.

2009-04-02 17:20:52 +00:00

chan_local.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_mgcp.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_misdn.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_nbs.c

one more place I forgot

2008-05-22 17:50:40 +00:00

chan_oss.c

Merged revisions 171187 via svnmerge from

2009-01-25 23:58:00 +00:00

chan_phone.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +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 bad merge from fix for issue 13867.

2009-04-08 00:01:49 +00:00

chan_skinny.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_unistim.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

chan_usbradio.c

Janitor, use ARRAY_LEN() when possible.

2008-12-05 10:31:25 +00:00

chan_vpb.cc

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

console_board.c

import the recent additions for video console into trunk,

2008-06-29 21:17:14 +00:00

console_gui.c

(closes issue #13557)

2008-10-09 14:17:33 +00:00

console_video.c

(closes issue #13557)

2008-10-09 14:17:33 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

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

iax2-parser.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

iax2-parser.h

Merged revisions 181340 via svnmerge from

2009-03-11 17:34:57 +00:00

iax2-provision.c

- iax2-provision was not freeing iax_templates structure when unloading the chan_iax2.so module.

2008-12-03 19:25:30 +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

Fixed iax2 key rotation backwards compatibility

2009-02-13 20:11:55 +00:00

Makefile

Simplify chan_h323 build to not require a second run of "make".

2009-03-29 05:32:04 +00:00

misdn_config.c

This commit introduces COLP/CONP and Redirecting party information into Asterisk.

2009-04-03 22:41:46 +00:00

vcodecs.c

(closes issue #13557)

2008-10-09 14:17:33 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

2008-07-14 16:50:54 +00:00