From c94279a6e3379da65aa2919d1c52b5918ecb8609 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Tue, 18 Aug 2009 20:42:51 +0000 Subject: git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.2.28@212958 f38db490-d61c-443f-a65b-d21fe96a405b --- CREDITS | 2 +- README.fpm | 8 -------- README.opsound | 22 ++++++++++++++++++++++ sounds/moh/LICENSE | 10 +++++++--- sounds/moh/fpm-calm-river.mp3 | Bin 1939812 -> 0 bytes sounds/moh/fpm-sunshine.mp3 | Bin 2582496 -> 0 bytes sounds/moh/fpm-world-mix.mp3 | Bin 2217563 -> 0 bytes sounds/moh/macroform-cold_day.mp3 | Bin 0 -> 5329576 bytes sounds/moh/macroform-robot_dity.mp3 | Bin 0 -> 4067300 bytes sounds/moh/macroform-the_simplicity.mp3 | Bin 0 -> 6687558 bytes sounds/moh/manolo_camp-morning_coffee.mp3 | Bin 0 -> 2343059 bytes sounds/moh/reno_project-system.mp3 | Bin 0 -> 7586772 bytes 12 files changed, 30 insertions(+), 12 deletions(-) delete mode 100644 README.fpm create mode 100644 README.opsound delete mode 100644 sounds/moh/fpm-calm-river.mp3 delete mode 100644 sounds/moh/fpm-sunshine.mp3 delete mode 100644 sounds/moh/fpm-world-mix.mp3 create mode 100644 sounds/moh/macroform-cold_day.mp3 create mode 100644 sounds/moh/macroform-robot_dity.mp3 create mode 100644 sounds/moh/macroform-the_simplicity.mp3 create mode 100644 sounds/moh/manolo_camp-morning_coffee.mp3 create mode 100644 sounds/moh/reno_project-system.mp3 diff --git a/CREDITS b/CREDITS index 452b2fa05..5be0a1af4 100644 --- a/CREDITS +++ b/CREDITS @@ -95,7 +95,7 @@ Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book available under a Creative Commons License at http://www.asteriskdocs.org === HOLD MUSIC === -Music provided by www.freeplaymusic.com +Music provided by www.opsound.org === OTHER SOURCE CODE IN ASTERISK === diff --git a/README.fpm b/README.fpm deleted file mode 100644 index ad11c4815..000000000 --- a/README.fpm +++ /dev/null @@ -1,8 +0,0 @@ -About Hold Music -================ -Digium has licensed the music included with -the Asterisk distribution From FreePlayMusic -for use and distribution with Asterisk. It -is licensed ONLY for use as hold music within -an Asterisk based PBX. - diff --git a/README.opsound b/README.opsound new file mode 100644 index 000000000..99a59f88b --- /dev/null +++ b/README.opsound @@ -0,0 +1,22 @@ +About Hold Music +================ +These files were obtained from http://opsound.org, where the authors placed them +under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which +may be found at http://creativecommons.org. + +Credits +================ +macroform-cold_day - Paul Shuler (Macroform) +paulshuler@gmail.com - http://macroform.bandcamp.com/ + +macroform-robot_dity - Paul Shuler (Macroform) +paulshuler@gmail.com - http://macroform.bandcamp.com/ + +macroform-the_simplicity - Paul Shuler (Macroform) +paulshuler@gmail.com - http://macroform.bandcamp.com/ + +manolo_camp-morning_coffee - Manolo Camp +beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp + +reno_project-system - Reno Project +renoproject@hotmail.com - http://www.jamendo.com/en/album/23661 diff --git a/sounds/moh/LICENSE b/sounds/moh/LICENSE index adefcc4ad..08c79f919 100644 --- a/sounds/moh/LICENSE +++ b/sounds/moh/LICENSE @@ -1,3 +1,7 @@ -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. +About Hold Music +================ +These files were obtained from http://opsound.org, where the authors placed them +under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which +may be found at http://creativecommons.org. + + diff --git a/sounds/moh/fpm-calm-river.mp3 b/sounds/moh/fpm-calm-river.mp3 deleted file mode 100644 index 8d93b2900..000000000 Binary files a/sounds/moh/fpm-calm-river.mp3 and /dev/null differ diff --git a/sounds/moh/fpm-sunshine.mp3 b/sounds/moh/fpm-sunshine.mp3 deleted file mode 100644 index 106953307..000000000 Binary files a/sounds/moh/fpm-sunshine.mp3 and /dev/null differ diff --git a/sounds/moh/fpm-world-mix.mp3 b/sounds/moh/fpm-world-mix.mp3 deleted file mode 100644 index 7d1e76d9f..000000000 Binary files a/sounds/moh/fpm-world-mix.mp3 and /dev/null differ diff --git a/sounds/moh/macroform-cold_day.mp3 b/sounds/moh/macroform-cold_day.mp3 new file mode 100644 index 000000000..63e3aa6d5 Binary files /dev/null and b/sounds/moh/macroform-cold_day.mp3 differ diff --git a/sounds/moh/macroform-robot_dity.mp3 b/sounds/moh/macroform-robot_dity.mp3 new file mode 100644 index 000000000..b90139e99 Binary files /dev/null and b/sounds/moh/macroform-robot_dity.mp3 differ diff --git a/sounds/moh/macroform-the_simplicity.mp3 b/sounds/moh/macroform-the_simplicity.mp3 new file mode 100644 index 000000000..850e49119 Binary files /dev/null and b/sounds/moh/macroform-the_simplicity.mp3 differ diff --git a/sounds/moh/manolo_camp-morning_coffee.mp3 b/sounds/moh/manolo_camp-morning_coffee.mp3 new file mode 100644 index 000000000..a9d1c0f5a Binary files /dev/null and b/sounds/moh/manolo_camp-morning_coffee.mp3 differ diff --git a/sounds/moh/reno_project-system.mp3 b/sounds/moh/reno_project-system.mp3 new file mode 100644 index 000000000..748c4c508 Binary files /dev/null and b/sounds/moh/reno_project-system.mp3 differ -- cgit v1.2.3