diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-16 19:33:26 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-16 19:33:26 +0000 |
commit | c42c4096d835db278322522505b1a68b66b93efe (patch) | |
tree | a310f16561d035e7169223acad17688957552302 | |
parent | 72859c2a187b0dac6bb9b595196a59abb781bfbb (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@75303 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | sounds/moh/LICENSE | 3 | ||||
-rw-r--r-- | sounds/moh/fpm-calm-river.mp3 (renamed from sounds/fpm-calm-river.mp3) | bin | 1939812 -> 1939812 bytes | |||
-rw-r--r-- | sounds/moh/fpm-sunshine.mp3 (renamed from sounds/fpm-sunshine.mp3) | bin | 2582496 -> 2582496 bytes | |||
-rw-r--r-- | sounds/moh/fpm-world-mix.mp3 (renamed from sounds/fpm-world-mix.mp3) | bin | 2217563 -> 2217563 bytes |
5 files changed, 4 insertions, 1 deletions
@@ -799,7 +799,7 @@ samples: adsi fi; \ done mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/*.mp3; do \ + for x in sounds/moh/*.mp3 sounds/moh/LICENSE; do \ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ done rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 diff --git a/sounds/moh/LICENSE b/sounds/moh/LICENSE new file mode 100644 index 000000000..adefcc4ad --- /dev/null +++ b/sounds/moh/LICENSE @@ -0,0 +1,3 @@ +Music Provided By www.freeplaymusic.com. These sound files are provided by +Digium under license from Freeplay Music Corporation for use in conjunction +with the Asterisk software only. diff --git a/sounds/fpm-calm-river.mp3 b/sounds/moh/fpm-calm-river.mp3 Binary files differindex 8d93b2900..8d93b2900 100644 --- a/sounds/fpm-calm-river.mp3 +++ b/sounds/moh/fpm-calm-river.mp3 diff --git a/sounds/fpm-sunshine.mp3 b/sounds/moh/fpm-sunshine.mp3 Binary files differindex 106953307..106953307 100644 --- a/sounds/fpm-sunshine.mp3 +++ b/sounds/moh/fpm-sunshine.mp3 diff --git a/sounds/fpm-world-mix.mp3 b/sounds/moh/fpm-world-mix.mp3 Binary files differindex 7d1e76d9f..7d1e76d9f 100644 --- a/sounds/fpm-world-mix.mp3 +++ b/sounds/moh/fpm-world-mix.mp3 |