Mark Michelson 3838cb33b7 Merged revisions 259957 via svnmerge from ...

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

........
  r259957 | mmichelson | 2010-04-28 17:34:15 -0500 (Wed, 28 Apr 2010) | 11 lines
  
  Don't override peer context with domain context.
  
  (closes issue #17040)
  Reported by: pprindeville
  Patches:
        asterisk-1.6-bugid17040.patch uploaded by pprindeville (license 347)
  Tested by: pprindeville
  
  Review: https://reviewboard.asterisk.org/r/565/
........


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

2010-04-28 22:35:29 +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 241314 via svnmerge from

2010-01-19 19:01:09 +00:00

chan_alsa.c

Merged revisions 249893 via svnmerge from

2010-03-02 19:15:23 +00:00

chan_console.c

Merged revisions 249893 via svnmerge from

2010-03-02 19:15:23 +00:00

chan_dahdi.c

Merged revisions 259538 via svnmerge from

2010-04-27 22:37:40 +00:00

chan_gtalk.c

Merged revisions 249893 via svnmerge from

2010-03-02 19:15:23 +00:00

chan_h323.c

Merged revisions 255410 via svnmerge from

2010-03-30 20:57:48 +00:00

chan_iax2.c

Merged revisions 250395 via svnmerge from

2010-03-03 18:05:24 +00:00

chan_jingle.c

Merged revisions 249893 via svnmerge from

2010-03-02 19:15:23 +00:00

chan_local.c

Merged revisions 259870 via svnmerge from

2010-04-28 21:33:16 +00:00

chan_mgcp.c

Revert API change in release branches

2010-03-17 16:25:52 +00:00

chan_misdn.c

Merged revisions 247914 via svnmerge from

2010-02-19 18:22:12 +00:00

chan_nbs.c

one more place I forgot

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

chan_oss.c

Merged revisions 249893 via svnmerge from

2010-03-02 19:15:23 +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 259957 via svnmerge from

2010-04-28 22:35:29 +00:00

chan_skinny.c

Revert API change in release branches

2010-03-17 16:25:52 +00:00

chan_unistim.c

Merged revisions 249893 via svnmerge from

2010-03-02 19:15:23 +00:00

chan_usbradio.c

Merged revisions 254718 via svnmerge from

2010-03-25 20:09:29 +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 243943 via svnmerge from

2010-01-28 20:03:41 +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 245578 via svnmerge from

2010-02-08 22:46:36 +00:00

misdn_config.c

Merged revisions 249893 via svnmerge from

2010-03-02 19:15:23 +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