From 6c33d076aba556c17eabb5e995261aeb7c2e91d3 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.0.12@212958 f38db490-d61c-443f-a65b-d21fe96a405b --- CREDITS | 2 +- ChangeLog | 2 +- README.fpm | 8 -------- README.opsound | 22 ++++++++++++++++++++++ sounds/fpm-calm-river.mp3 | Bin 1939812 -> 0 bytes sounds/fpm-sunshine.mp3 | Bin 2582496 -> 0 bytes sounds/fpm-world-mix.mp3 | Bin 2217563 -> 0 bytes sounds/macroform-cold_day.mp3 | Bin 0 -> 5329576 bytes sounds/macroform-robot_dity.mp3 | Bin 0 -> 4067300 bytes sounds/macroform-the_simplicity.mp3 | Bin 0 -> 6687558 bytes sounds/manolo_camp-morning_coffee.mp3 | Bin 0 -> 2343059 bytes sounds/reno_project-system.mp3 | Bin 0 -> 7586772 bytes 12 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 README.fpm create mode 100644 README.opsound delete mode 100644 sounds/fpm-calm-river.mp3 delete mode 100644 sounds/fpm-sunshine.mp3 delete mode 100644 sounds/fpm-world-mix.mp3 create mode 100644 sounds/macroform-cold_day.mp3 create mode 100644 sounds/macroform-robot_dity.mp3 create mode 100644 sounds/macroform-the_simplicity.mp3 create mode 100644 sounds/manolo_camp-morning_coffee.mp3 create mode 100644 sounds/reno_project-system.mp3 diff --git a/CREDITS b/CREDITS index 11552bdec..e9664b72e 100644 --- a/CREDITS +++ b/CREDITS @@ -65,7 +65,7 @@ Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin. John Todd - Monkey sounds and associated teletorture prompt === HOLD MUSIC === -Music provided by www.freeplaymusic.com +Music provided by www.opsound.org === OTHER SOURCE CODE IN ASTERISK === diff --git a/ChangeLog b/ChangeLog index aa1a1c0d7..3bed210a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -294,7 +294,7 @@ Asterisk 1.0-RC2 -- Additional CDR backends -- Allow muted to reconnect -- Call parking improvements (including SIP parking support) - -- Added licensed hold music from FreePlayMusic + -- Added licensed hold music from opsound.org -- GR-303 and Zap improvements -- More bug fixes from the bug tracker -- Improved FreeBSD/OpenBSD/MacOS X support 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/fpm-calm-river.mp3 b/sounds/fpm-calm-river.mp3 deleted file mode 100644 index 8d93b2900..000000000 Binary files a/sounds/fpm-calm-river.mp3 and /dev/null differ diff --git a/sounds/fpm-sunshine.mp3 b/sounds/fpm-sunshine.mp3 deleted file mode 100644 index 106953307..000000000 Binary files a/sounds/fpm-sunshine.mp3 and /dev/null differ diff --git a/sounds/fpm-world-mix.mp3 b/sounds/fpm-world-mix.mp3 deleted file mode 100644 index 7d1e76d9f..000000000 Binary files a/sounds/fpm-world-mix.mp3 and /dev/null differ diff --git a/sounds/macroform-cold_day.mp3 b/sounds/macroform-cold_day.mp3 new file mode 100644 index 000000000..63e3aa6d5 Binary files /dev/null and b/sounds/macroform-cold_day.mp3 differ diff --git a/sounds/macroform-robot_dity.mp3 b/sounds/macroform-robot_dity.mp3 new file mode 100644 index 000000000..b90139e99 Binary files /dev/null and b/sounds/macroform-robot_dity.mp3 differ diff --git a/sounds/macroform-the_simplicity.mp3 b/sounds/macroform-the_simplicity.mp3 new file mode 100644 index 000000000..850e49119 Binary files /dev/null and b/sounds/macroform-the_simplicity.mp3 differ diff --git a/sounds/manolo_camp-morning_coffee.mp3 b/sounds/manolo_camp-morning_coffee.mp3 new file mode 100644 index 000000000..a9d1c0f5a Binary files /dev/null and b/sounds/manolo_camp-morning_coffee.mp3 differ diff --git a/sounds/reno_project-system.mp3 b/sounds/reno_project-system.mp3 new file mode 100644 index 000000000..748c4c508 Binary files /dev/null and b/sounds/reno_project-system.mp3 differ -- cgit v1.2.3