aboutsummaryrefslogtreecommitdiffstats
path: root/sounds/moh
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-18 20:42:51 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-18 20:42:51 +0000
commit1a3b1afcc5eb7dcdf447d81c1d5a7917ad621910 (patch)
treea9bba89665bc6e39b319cacf856fc6815ccc1db2 /sounds/moh
parent111358cd43b8cc909cb06edd9cfeeff53c3b7a42 (diff)
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.2.31@212958 f38db490-d61c-443f-a65b-d21fe96a405bv1.2.31
Diffstat (limited to 'sounds/moh')
-rw-r--r--sounds/moh/LICENSE10
-rw-r--r--sounds/moh/fpm-calm-river.mp3bin1939812 -> 0 bytes
-rw-r--r--sounds/moh/fpm-sunshine.mp3bin2582496 -> 0 bytes
-rw-r--r--sounds/moh/fpm-world-mix.mp3bin2217563 -> 0 bytes
-rw-r--r--sounds/moh/macroform-cold_day.mp3bin0 -> 5329576 bytes
-rw-r--r--sounds/moh/macroform-robot_dity.mp3bin0 -> 4067300 bytes
-rw-r--r--sounds/moh/macroform-the_simplicity.mp3bin0 -> 6687558 bytes
-rw-r--r--sounds/moh/manolo_camp-morning_coffee.mp3bin0 -> 2343059 bytes
-rw-r--r--sounds/moh/reno_project-system.mp3bin0 -> 7586772 bytes
9 files changed, 7 insertions, 3 deletions
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
--- a/sounds/moh/fpm-calm-river.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/moh/fpm-sunshine.mp3 b/sounds/moh/fpm-sunshine.mp3
deleted file mode 100644
index 106953307..000000000
--- a/sounds/moh/fpm-sunshine.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/moh/fpm-world-mix.mp3 b/sounds/moh/fpm-world-mix.mp3
deleted file mode 100644
index 7d1e76d9f..000000000
--- a/sounds/moh/fpm-world-mix.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/moh/macroform-cold_day.mp3 b/sounds/moh/macroform-cold_day.mp3
new file mode 100644
index 000000000..63e3aa6d5
--- /dev/null
+++ b/sounds/moh/macroform-cold_day.mp3
Binary files differ
diff --git a/sounds/moh/macroform-robot_dity.mp3 b/sounds/moh/macroform-robot_dity.mp3
new file mode 100644
index 000000000..b90139e99
--- /dev/null
+++ b/sounds/moh/macroform-robot_dity.mp3
Binary files differ
diff --git a/sounds/moh/macroform-the_simplicity.mp3 b/sounds/moh/macroform-the_simplicity.mp3
new file mode 100644
index 000000000..850e49119
--- /dev/null
+++ b/sounds/moh/macroform-the_simplicity.mp3
Binary files 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
--- /dev/null
+++ b/sounds/moh/manolo_camp-morning_coffee.mp3
Binary files differ
diff --git a/sounds/moh/reno_project-system.mp3 b/sounds/moh/reno_project-system.mp3
new file mode 100644
index 000000000..748c4c508
--- /dev/null
+++ b/sounds/moh/reno_project-system.mp3
Binary files differ