[asterisk-commits] kpfleming: branch 1.6.1 r137683 - in /branches/1.6.1: ./ Zaptel-to-DAHDI.txt

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Aug 13 21:08:56 2008
New Revision: 137683

URL: http://svn.digium.com/view/asterisk?view=rev&rev=137683
Log:
Merged revisions 137680 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r137680 | kpfleming | 2008-08-13 21:03:47 -0500 (Wed, 13 Aug 2008) | 9 lines

Merged revisions 137679 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137679 | kpfleming | 2008-08-13 21:03:04 -0500 (Wed, 13 Aug 2008) | 1 line

forgot one module name that changed
........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Zaptel-to-DAHDI.txt

Propchange: branches/1.6.1/
            ('branch-1.4-blocked' removed)

Propchange: branches/1.6.1/
            ('branch-1.4-merged' removed)

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Aug 13 21:08:56 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647
+/trunk:1-137647,137680

Modified: branches/1.6.1/Zaptel-to-DAHDI.txt
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/Zaptel-to-DAHDI.txt?view=diff&rev=137683&r1=137682&r2=137683
==============================================================================
--- branches/1.6.1/Zaptel-to-DAHDI.txt (original)
+++ branches/1.6.1/Zaptel-to-DAHDI.txt Wed Aug 13 21:08:56 2008
@@ -18,6 +18,7 @@
   app_zapbarge.so -> app_dahdibarge.so
   app_zapras.so -> app_dahdiras.so
   app_zapscan.so -> app_dahdiscan.so
+  codec_zap.so -> codec_dahdi.so
 
 Second, the behavior of many modules has changed due to the switch to
 DAHDI; the changes are listed below.