Mark Michelson a6fa7f7283 Merged revisions 186837 via svnmerge from ...

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

........
  r186837 | mmichelson | 2009-04-07 19:01:49 -0500 (Tue, 07 Apr 2009) | 7 lines
  
  Fix bad merge from fix for issue 13867.
  
  (closes issue #14686)
  Reported by: davidw
........


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

2009-04-08 00:02:39 +00:00

..

h323

Merged revisions 184910 via svnmerge from

2009-03-30 13:57:30 +00:00

misdn

Merged revisions 185122 via svnmerge from

2009-03-30 20:50:00 +00:00

xpmr

Merged revisions 159050 via svnmerge from

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

chan_agent.c

Merged revisions 171691 via svnmerge from

2009-01-27 22:01:52 +00:00

chan_alsa.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:32:47 +00:00

chan_console.c

Merged revisions 157039 via svnmerge from

2008-11-15 04:09:13 +00:00

chan_dahdi.c

Merged revisions 186461 via svnmerge from

2009-04-03 20:21:23 +00:00

chan_gtalk.c

Merged revisions 185363 via svnmerge from

2009-03-31 17:48:43 +00:00

chan_h323.c

Merged revisions 182722 via svnmerge from

2009-03-17 20:52:54 +00:00

chan_iax2.c

Merged revisions 184762 via svnmerge from

2009-03-27 19:17:22 +00:00

chan_jingle.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_local.c

Merged revisions 182211,182278 via svnmerge from

2009-03-16 17:38:50 +00:00

chan_mgcp.c

Merged revisions 184339 via svnmerge from

2009-03-25 22:02:20 +00:00

chan_misdn.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:35:59 +00:00

chan_nbs.c

one more place I forgot

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

chan_oss.c

Merged revisions 171188 via svnmerge from

2009-01-26 00:04:28 +00:00

chan_phone.c

Merged revisions 160170-160172 via svnmerge from

2008-12-01 23:53:18 +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

Merged revisions 186837 via svnmerge from

2009-04-08 00:02:39 +00:00

chan_skinny.c

Merged revisions 184339 via svnmerge from

2009-03-25 22:02:20 +00:00

chan_unistim.c

Merged revisions 184339 via svnmerge from

2009-03-25 22:02:20 +00:00

chan_usbradio.c

Merged revisions 159050 via svnmerge from

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

chan_vpb.cc

Merged revisions 159818 via svnmerge from

2008-11-29 18:16:50 +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

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

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

iax2-parser.c

Merged revisions 143031 via svnmerge from

2008-09-13 13:58:15 +00:00

iax2-parser.h

Merged revisions 181371 via svnmerge from

2009-03-11 17:40:10 +00:00

iax2-provision.c

Merged revisions 160663 via svnmerge from

2008-12-03 19:49:36 +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

Merged revisions 175597 via svnmerge from

2009-02-13 20:48:47 +00:00

Makefile

Merged revisions 184838 via svnmerge from

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

misdn_config.c

Merged revisions 185123 via svnmerge from

2009-03-30 20:50:55 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

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