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

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jul 27 19:19:46 2009
New Revision: 209327

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209327
Log:
Merged revisions 209317 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r209317 | tilghman | 2009-07-27 19:14:12 -0500 (Mon, 27 Jul 2009) | 9 lines
  
  Merged revisions 209315 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r209315 | tilghman | 2009-07-27 19:12:03 -0500 (Mon, 27 Jul 2009) | 2 lines
    
    Publish French extra sounds
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    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/sounds.xml
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/sounds/sounds.xml?view=diff&rev=209327&r1=209326&r2=209327
==============================================================================
--- branches/1.6.1/sounds/sounds.xml (original)
+++ branches/1.6.1/sounds/sounds.xml Mon Jul 27 19:19:46 2009
@@ -73,4 +73,20 @@
 		</member>
 		<member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
 		</member>
+		<member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
+		</member>
+		<member name="EXTRA-SOUNDS-FR-WAV" displayname="French, WAV format">
+		</member>
+		<member name="EXTRA-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
+		</member>
+		<member name="EXTRA-SOUNDS-FR-ALAW" displayname="French, a-Law format">
+		</member>
+		<member name="EXTRA-SOUNDS-FR-GSM" displayname="French, GSM format" >
+		</member>
+		<member name="EXTRA-SOUNDS-FR-G729" displayname="French, G.729 format">
+		</member>
+		<member name="EXTRA-SOUNDS-FR-G722" displayname="French, G.722 format">
+		</member>
+		<member name="EXTRA-SOUNDS-FR-SLN16" displayname="French, Signed-linear 16kHz format">
+		</member>
 	</category>