Kevin P. Fleming 466344f266 Merged revisions 230247 via svnmerge from ...

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

................
  r230247 | kpfleming | 2009-11-15 11:23:02 -0600 (Sun, 15 Nov 2009) | 12 lines
  
  Merged revisions 230246 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r230246 | kpfleming | 2009-11-15 11:19:06 -0600 (Sun, 15 Nov 2009) | 6 lines
    
    Correct mistaken option name in error message.
    
    The configuration option for allowing hosts to make non-token-based calls
    is 'calltokenoptional', not 'calltokenignore'. (reported on asterisk-users)
  ........
................


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

2009-11-15 17:24:32 +00:00

..

h323

Merged revisions 201678 via svnmerge from

2009-06-18 16:51:54 +00:00

misdn

Merged revisions 221844 via svnmerge from

2009-10-02 01:26:47 +00:00

xpmr

Merged revisions 201678 via svnmerge from

2009-06-18 16:51:54 +00:00

chan_agent.c

Merged revisions 212581 via svnmerge from

2009-08-17 18:55:32 +00:00

chan_alsa.c

Merged revisions 196988 via svnmerge from

2009-05-27 13:05:27 +00:00

chan_console.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:36:36 +00:00

chan_dahdi.c

Merged revisions 227275 via svnmerge from

2009-11-03 18:11:08 +00:00

chan_gtalk.c

Merged revisions 139281,175058,175089 via svnmerge from

2009-09-15 21:53:03 +00:00

chan_h323.c

Fix interpretation of PRIREDIRECTIONREASON set by chan_sip.

2009-10-09 23:11:42 +00:00

chan_iax2.c

Merged revisions 230247 via svnmerge from

2009-11-15 17:24:32 +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 230039 via svnmerge from

2009-11-13 19:45:35 +00:00

chan_mgcp.c

AST-2009-005

2009-08-10 19:30:55 +00:00

chan_misdn.c

Merged revisions 228145 via svnmerge from

2009-11-05 19:41:40 +00:00

chan_nbs.c

one more place I forgot

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

chan_oss.c

Merged revisions 229750 via svnmerge from

2009-11-12 23:31:12 +00:00

chan_phone.c

gcc 4.4: Remove a nop memset size 0 that annoys gcc

2009-09-13 21:48:02 +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 230145 via svnmerge from

2009-11-13 22:01:24 +00:00

chan_skinny.c

Merged revisions 215665 via svnmerge from

2009-09-02 21:30:37 +00:00

chan_unistim.c

Merged revisions 192938 via svnmerge from

2009-05-07 17:15:00 +00:00

chan_usbradio.c

AST-2009-005

2009-08-10 19:30:55 +00:00

chan_vpb.cc

Merged revisions 228080 via svnmerge from

2009-11-05 19:19:34 +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 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

iax2-parser.h

Merged revisions 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

iax2-provision.c

AST-2009-005

2009-08-10 19:30:55 +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 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:48:38 +00:00

misdn_config.c

Merged revisions 222799 via svnmerge from

2009-10-08 16:49:43 +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