[svn-commits] qwell: branch 1.6.0 r138632 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Aug 18 10:54:40 2008
New Revision: 138632

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138632
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.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=138632&r1=138631&r2=138632
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Mon Aug 18 10:54:40 2008
@@ -676,7 +676,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]" ; \