From: Leif Madsen <leif@leifmadsen.com>
Date: Tue, 27 Apr 2010 21:50:45 +0000 (+0000)
Subject: Merged revisions 259527 via svnmerge from
X-Git-Tag: 1.6.1.20-rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41250af3920f62d50ea075060774ed5f00a782b3;p=thirdparty%2Fasterisk.git

Merged revisions 259527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259527 | lmadsen | 2010-04-27 16:49:36 -0500 (Tue, 27 Apr 2010) | 23 lines

  Merged revisions 259526 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r259526 | lmadsen | 2010-04-27 16:48:47 -0500 (Tue, 27 Apr 2010) | 15 lines

    Update sounds files.

    * Add additional sounds prompts for say_enumeration
    * Update the English conference sounds prompts so they are better
      quality and all sound more consistent
    * Clean up the core-sounds-XX.txt and extra-sounds-XX.txt files to
      include all present sound files

    Both core (en, fr, es) and extra (en, fr) sounds files have been updated.

    (closes issue #16200)
    Reported by: murf

    (closes issue #17137)
    Reported by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/sounds/Makefile b/sounds/Makefile
index fe362d4a52..b1c2045f5d 100644
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -17,8 +17,8 @@
 
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.17
-EXTRA_SOUNDS_VERSION:=1.4.10
+CORE_SOUNDS_VERSION:=1.4.18
+EXTRA_SOUNDS_VERSION:=1.4.11
 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases
 MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
 MCS:=$(subst -FR-,-fr-,$(MCS))