[svn-commits] r145291 - svn:log

[SVN commits to the Digium repositories]

Author: rmudgett
Revision: 145291
Modified property: svn:log

Modified: svn:log at Tue Sep 30 19:11:28 2008
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Sep 30 19:11:28 2008
@@ -1,0 +1,30 @@
+Merged revisions 145200,145226 via svnmerge from 
+https://origsvn.digium.com/svn/asterisk/trunk
+
+........
+  r145200 | rmudgett | 2008-09-30 16:00:54 -0500 (Tue, 30 Sep 2008) | 7 lines
+  
+  *  Miscellaneous formatting changes to make v1.4 and trunk
+  more merge compatible in the mISDN area.
+  
+  channels/chan_misdn.c
+  *  Eliminated redundant code in cb_events() EVENT_SETUP
+........
+  r145226 | russell | 2008-09-30 16:32:53 -0500 (Tue, 30 Sep 2008) | 16 lines
+  
+  Add support for call pickup on Snom phones.  Asterisk now includes a magic
+  call-id in the dialog-info event package used with extension state subscriptions
+  on Snom phones.  Then, when the phone sends an INVITE with Replaces for the
+  special callid, Asterisk will perform a pickup on the extension that was
+  subscribed to.
+  
+  The original code on this issue was submitted by xylome.  However, contributions
+  have been made by (at least) mgernoth and pkempgen.  The final patch was written
+  by seanbright, and includes the necessary logic to allow this work in a
+  technology independent way.
+  
+  (closes issue #5014)
+  Reported by: xylome
+  Patches:
+        issue5014-trunk.diff uploaded by seanbright (license 71)
+........