[asterisk-commits] tilghman: branch 1.6.1 r148011 - in /branches/1.6.1: ./ sounds/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Oct  9 15:01:38 2008
New Revision: 148011

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

........
  r148010 | tilghman | 2008-10-09 15:00:46 -0500 (Thu, 09 Oct 2008) | 1 line
  
  Publish MOH files in sln16 format
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/sounds/Makefile
    branches/1.6.1/sounds/sounds.xml

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

Modified: branches/1.6.1/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/sounds/Makefile?view=diff&rev=148011&r1=148010&r2=148011
==============================================================================
--- branches/1.6.1/sounds/Makefile (original)
+++ branches/1.6.1/sounds/Makefile Thu Oct  9 15:01:38 2008
@@ -50,6 +50,7 @@
 MM:=$(subst -GSM,-gsm,$(MM))
 MM:=$(subst -G729,-g729,$(MM))
 MM:=$(subst -G722,-g722,$(MM))
+MM:=$(subst -SLN16,-sln16,$(MM))
 MOH:=$(MM:MOH-%=asterisk-moh-%.tar.gz)
 MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
 # If "fetch" is used, --continue is not a valid option.

Modified: branches/1.6.1/sounds/sounds.xml
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/sounds/sounds.xml?view=diff&rev=148011&r1=148010&r2=148011
==============================================================================
--- branches/1.6.1/sounds/sounds.xml (original)
+++ branches/1.6.1/sounds/sounds.xml Thu Oct  9 15:01:38 2008
@@ -57,6 +57,8 @@
 		</member>
 		<member name="MOH-FREEPLAY-G722" displayname="FreePlay Music On Hold Files, G.722 format" >
 		</member>
+		<member name="MOH-FREEPLAY-SLN16" displayname="FreePlay Music On Hold Files, Signed-linear 16kHz format" >
+		</member>
 	</category>
 	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
 		<member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">