[asterisk-commits] dvossel: branch 1.6.1 r241630 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Jan 20 14:12:50 2010
New Revision: 241630

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

................
  r241627 | dvossel | 2010-01-20 14:01:07 -0600 (Wed, 20 Jan 2010) | 12 lines
  
  Merged revisions 241626 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241626 | dvossel | 2010-01-20 14:00:04 -0600 (Wed, 20 Jan 2010) | 6 lines
    
    fixes parsing error in Makefile.
    
    Some echo lines were missing "; . Thanks to jparker for pointing out
    the problem. 
  ........
................

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

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

Modified: branches/1.6.1/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile?view=diff&rev=241630&r1=241629&r2=241630
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Wed Jan 20 14:12:50 2010
@@ -685,11 +685,11 @@
 		echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
 		echo ";record_cache_dir = /tmp ; Specify cache directory (used in conjunction with cache_record_files)" ; \
 		echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
-		echo ";transmit_silence = yes ; Transmit silence while a channel is in a waiting state, a recording only state, or when DTMF is \
-		echo "                        ; being generated.  Note that the silence internally is generated in raw signed linear format. \
-		echo "                        ; This means that it must be transcoded into the native format of the channel before it can be sent \
-		echo "                        ; to the device.  It is for this reason that this is optional, as it may result in requiring a \
-		echo "                        ; temporary codec translation path for a channel that may not otherwise require one. \
+		echo ";transmit_silence = yes ; Transmit silence while a channel is in a waiting state, a recording only state, or when DTMF is" ; \
+		echo "                        ; being generated.  Note that the silence internally is generated in raw signed linear format." ; \
+		echo "                        ; This means that it must be transcoded into the native format of the channel before it can be sent" ; \
+		echo "                        ; to the device.  It is for this reason that this is optional, as it may result in requiring a" ; \
+		echo "                        ; temporary codec translation path for a channel that may not otherwise require one." ; \
 		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" ; \