David Vossel 381faf6c54 Merged revisions 248397 via svnmerge from ...

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

................
  r248397 | dvossel | 2010-02-23 10:34:39 -0600 (Tue, 23 Feb 2010) | 15 lines
  
  Merged revisions 248396 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r248396 | dvossel | 2010-02-23 10:26:05 -0600 (Tue, 23 Feb 2010) | 9 lines
    
    fixes invite with replaces deadlock
    
    (closes issue #16862)
    Reported by: pwalker
    Patches:
          replaces_deadlock_1.4 uploaded by dvossel (license 671)
    Tested by: pwalker, dvossel
  ........
................


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

2010-02-23 16:48:37 +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 209400 via svnmerge from

2010-01-07 21:17:32 +00:00

chan_console.c

Merged revisions 228798 via svnmerge from

2010-02-19 19:05:34 +00:00

chan_dahdi.c

Merged revisions 244505 via svnmerge from

2010-02-03 18:43:37 +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 245793 via svnmerge from

2010-02-09 23:13:07 +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 246070 via svnmerge from

2010-02-10 16:55:27 +00:00

chan_mgcp.c

AST-2009-005

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

2010-01-07 21:17:32 +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 248397 via svnmerge from

2010-02-23 16:48:37 +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

Merged revisions 209400 via svnmerge from

2010-01-07 21:17:32 +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 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