[asterisk-commits] mjordan: branch mjordan/cdrs-of-doom r386924 - in /team/mjordan/cdrs-of-doom:...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Mon Apr 29 21:41:05 2013
New Revision: 386924

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386924
Log:
Re-enable automerge

Modified:
    team/mjordan/cdrs-of-doom/   (props changed)
    team/mjordan/cdrs-of-doom/sounds/Makefile

Propchange: team/mjordan/cdrs-of-doom/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mjordan/cdrs-of-doom/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/mjordan/cdrs-of-doom/
------------------------------------------------------------------------------
--- cdrs-of-doom-integrated (original)
+++ cdrs-of-doom-integrated Mon Apr 29 21:41:05 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-386874
+/team/group/bridge_construction:1-386923

Modified: team/mjordan/cdrs-of-doom/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/cdrs-of-doom/sounds/Makefile?view=diff&rev=386924&r1=386923&r2=386924
==============================================================================
--- team/mjordan/cdrs-of-doom/sounds/Makefile (original)
+++ team/mjordan/cdrs-of-doom/sounds/Makefile Mon Apr 29 21:41:05 2013
@@ -19,7 +19,7 @@
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.23
+CORE_SOUNDS_VERSION:=1.4.24
 EXTRA_SOUNDS_VERSION:=1.4.13
 MOH_VERSION:=2.03
 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases
@@ -28,6 +28,7 @@
 MCS:=$(subst -FR-,-fr-,$(MCS))
 MCS:=$(subst -ES-,-es-,$(MCS))
 MCS:=$(subst -RU-,-ru-,$(MCS))
+MCS:=$(subst -IT-,-it-,$(MCS))
 MCS:=$(subst -WAV,-wav,$(MCS))
 MCS:=$(subst -ULAW,-ulaw,$(MCS))
 MCS:=$(subst -ALAW,-alaw,$(MCS))
@@ -142,6 +143,8 @@
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION)))
 
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,it,$(CORE_SOUNDS_VERSION)))
+
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ru,$(CORE_SOUNDS_VERSION)))
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en,$(EXTRA_SOUNDS_VERSION)))