From: Automerge script Date: Wed, 12 Dec 2012 23:18:09 +0000 (+0000) Subject: Merged revisions 377925 via svnmerge from X-Git-Tag: 13.0.0-beta1~2194^2~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc90f6a9d9ce39deff1e8cb940bfbf088c3b50bb;p=thirdparty%2Fasterisk.git Merged revisions 377925 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r377925 | newtonr | 2012-12-12 16:43:40 -0600 (Wed, 12 Dec 2012) | 18 lines Incremented EXTRA_SOUNDS_VERSION in sounds/Makefile to 1.4.12 for new Extra Sounds releases See CHANGES-* files in English extra 1.4.12 tarballs for new sound prompts added. (closes ASTERISK-20328) Reported by: Matt Jordan (closes AST-755) Reported by: John Bigelow ........ Merged revisions 377922 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 377923 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 377924 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377928 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/sounds/Makefile b/sounds/Makefile index af811bc391..4f753eb729 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -20,7 +20,7 @@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh CORE_SOUNDS_VERSION:=1.4.22 -EXTRA_SOUNDS_VERSION:=1.4.11 +EXTRA_SOUNDS_VERSION:=1.4.12 MOH_VERSION:=2.03 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))