[svn-commits] qwell: branch 1.6.1 r138633 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Aug 18 10:55:01 2008
New Revision: 138633

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

........
r138631 | qwell | 2008-08-18 10:54:07 -0500 (Mon, 18 Aug 2008) | 1 line

Remove option that isn't valid here.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Aug 18 10:55:01 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409,138412,138442,138473,138476,138479,138482,138518
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409,138412,138442,138473,138476,138479,138482,138518,138631

Modified: branches/1.6.1/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/Makefile?view=diff&rev=138633&r1=138632&r2=138633
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Mon Aug 18 10:55:01 2008
@@ -684,7 +684,6 @@
 		echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
 		echo ";runuser = asterisk ; The user to run as" ; \
 		echo ";rungroup = asterisk ; The group to run as" ; \
-		echo "dahdichanname = yes ; Set channel name as DAHDI" ; \
 		echo "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \