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.

Automerge script 108f718fd5 Merged revisions 369325,369328 via svnmerge from ... file:///srv/subversion/repos/asterisk/branches/10 ................ r369325 | mmichelson | 2012-06-25 10:52:42 -0500 (Mon, 25 Jun 2012) | 20 lines Multiple revisions 369323-369324 ........ r369323 | mmichelson | 2012-06-25 10:35:43 -0500 (Mon, 25 Jun 2012) | 9 lines Eliminate embedding of res_adsi.so module. The way this is done is to stop using the optional API. Instead, res_adsi.so, when loaded fills in a table of function pointers. Review: https://reviewboard.asterisk.org/r/1991 ........ r369324 | mmichelson | 2012-06-25 10:50:17 -0500 (Mon, 25 Jun 2012) | 2 lines Forgot to svn add this file in my last commit. ........ Merged revisions 369323-369324 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ r369328 | rmudgett | 2012-06-25 10:59:28 -0500 (Mon, 25 Jun 2012) | 15 lines Fix Bridge application occasionally returning to the wrong location. * Fix do_bridge_masquerade() getting the resume location from the zombie channel. The code must not touch a clone channel after it has masqueraded it. The clone channel has become a zombie and is starting to hangup. (closes issue ASTERISK-19985) Reported by: jamicque Patches: jira_asterisk_19985_v1.8.patch (license #5621) patch uploaded by rmudgett Tested by: jamicque ........ Merged revisions 369327 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@369344 65c4cc65-6c06-0410-ace0-fbb531ad65f3		14 years ago
..
asterisk	Merged revisions 369325,369328 via svnmerge from	14 years ago
solaris-compat	…
asterisk.h	Some scheduler API cleanup and improvements.	15 years ago
jitterbuf.h	…