You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Mark Michelson 9145d4bbc8 Merge revision 187488 to 1.6.0. ... A note to all of you. Don't block revisions in a branch if you actually meant to merge them. Two very old revisions somehow didn't get merged into 1.6.0 and this change was dependent on those two old revisions. What should have taken 2 minutes has now wasted about 30 minutes of my time :( git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@187555 65c4cc65-6c06-0410-ace0-fbb531ad65f3		18 years ago
..
h323	Merged revisions 184910 via svnmerge from	18 years ago
misdn	Merged revisions 185122 via svnmerge from	18 years ago
xpmr	…
DialTone.h	…
Makefile	Merged revisions 184838 via svnmerge from	18 years ago
chan_agent.c	…
chan_alsa.c	Merged revisions 182847 via svnmerge from	18 years ago
chan_console.c	…
chan_dahdi.c	Merged revisions 186461 via svnmerge from	18 years ago
chan_features.c	…
chan_gtalk.c	Merged revisions 185363 via svnmerge from	18 years ago
chan_h323.c	…
chan_iax2.c	Merged revisions 184037 via svnmerge from	18 years ago
chan_jingle.c	…
chan_local.c	…
chan_mgcp.c	…
chan_misdn.c	…
chan_nbs.c	…
chan_oss.c	…
chan_phone.c	…
chan_sip.c	Merge revision 187488 to 1.6.0.	18 years ago
chan_skinny.c	Merged revisions 182847 via svnmerge from	18 years ago
chan_unistim.c	…
chan_usbradio.c	…
chan_vpb.cc	…
console_board.c	…
console_gui.c	…
console_video.c	…
console_video.h	…
iax2-parser.c	…
iax2-parser.h	…
iax2-provision.c	…
iax2-provision.h	…
iax2.h	…
misdn_config.c	Merged revisions 185123 via svnmerge from	18 years ago
vcodecs.c	…
vgrabbers.c	…