summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-12-04 22:44:13 +0100
committerReid <reidyaro@gmail.com>2012-12-04 22:44:13 +0100
commitabd48f146590d3478e54dbbed9e9ddbd14f2312d (patch)
tree4f9d78da8b02aaf2c754b1f5992200df24705157
parent3e75ab254b314b59d4d80fb8a69fd5e700331795 (diff)
downloadmusic-abd48f146590d3478e54dbbed9e9ddbd14f2312d.tar.gz
music-abd48f146590d3478e54dbbed9e9ddbd14f2312d.tar.bz2
music-abd48f146590d3478e54dbbed9e9ddbd14f2312d.tar.xz
music-abd48f146590d3478e54dbbed9e9ddbd14f2312d.zip
Rebase master branch.
-rw-r--r--Artis - The Adventure Begins.ogg (renamed from bartk-outoor-artis.ogg)bin5460814 -> 5460808 bytes
-rw-r--r--Artis indoor - In the Forest of the Birches.ogg (renamed from bartk-indoor-artis.ogg)bin2177893 -> 2177888 bytes
-rw-r--r--COPYING16
-rw-r--r--Ezili - Ocean sounds.ogg (renamed from ezili-outdoor-ocean.ogg)bin2257513 -> 2257565 bytes
-rw-r--r--guitarz-halloween-theme.oggbin983107 -> 0 bytes
5 files changed, 6 insertions, 10 deletions
diff --git a/bartk-outoor-artis.ogg b/Artis - The Adventure Begins.ogg
index 3662e2c..736e7fc 100644
--- a/bartk-outoor-artis.ogg
+++ b/Artis - The Adventure Begins.ogg
Binary files differ
diff --git a/bartk-indoor-artis.ogg b/Artis indoor - In the Forest of the Birches.ogg
index 5c50b2a..509f54d 100644
--- a/bartk-indoor-artis.ogg
+++ b/Artis indoor - In the Forest of the Birches.ogg
Binary files differ
diff --git a/COPYING b/COPYING
index 23820ea..2d0883a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,11 +1,7 @@
-Licensed under Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0 http://creativecommons.org/licenses/by-sa/3.0/):
+Contributor :
+http://soundcloud.com/lendrick (BartK from http://opengameart.org) contributed on :
+http://soundcloud.com/lendrick/untitled
+http://soundcloud.com/lendrick/the-adventure-begins
+With the following license : Attribution 3.0 Unported (CC BY 3.0)
- bartk-indoor-artis.ogg
- bartk-outdoor-artis.ogg
- ezili-outdoor-ocean.ogg
- guitarz-halloween-theme.ogg
-
-Authors:
- BartK (http://opengameart.org/)
- Ezili
- Guitarz1970 (http://www.freesound.org/people/Guitarz1970/) \ No newline at end of file
+ Creative Commons may be contacted at http://creativecommons.org/. \ No newline at end of file
diff --git a/ezili-outdoor-ocean.ogg b/Ezili - Ocean sounds.ogg
index 56b4bcb..4c3edfe 100644
--- a/ezili-outdoor-ocean.ogg
+++ b/Ezili - Ocean sounds.ogg
Binary files differ
diff --git a/guitarz-halloween-theme.ogg b/guitarz-halloween-theme.ogg
deleted file mode 100644
index b20b2c3..0000000
--- a/guitarz-halloween-theme.ogg
+++ /dev/null
Binary files differ