summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2017-08-18 21:19:08 +0000
committerReid <reidyaro@gmail.com>2017-08-18 21:19:08 +0000
commitd1185c858a7a0e139b735388a1a75dfeacd08855 (patch)
treef9e8523c1a64c30d88ecbff976849b2cdc274eee
parente3c5cae3396a14e8f1136077dc51045ae50f6b24 (diff)
parenta7e0f4a5d9985555e284574349d4027c9e9b0d6c (diff)
downloadmusic-d1185c858a7a0e139b735388a1a75dfeacd08855.tar.gz
music-d1185c858a7a0e139b735388a1a75dfeacd08855.tar.bz2
music-d1185c858a7a0e139b735388a1a75dfeacd08855.tar.xz
music-d1185c858a7a0e139b735388a1a75dfeacd08855.zip
Merge branch 'hurnscald' into 'master'
music for hurnscald See merge request !2
-rw-r--r--music/LICENSE15
-rw-r--r--music/magick-real.oggbin0 -> 1829108 bytes
-rw-r--r--music/the-forest.oggbin0 -> 3154894 bytes
3 files changed, 8 insertions, 7 deletions
diff --git a/music/LICENSE b/music/LICENSE
index 6681d24..9fbd359 100644
--- a/music/LICENSE
+++ b/music/LICENSE
@@ -14,10 +14,11 @@ https://www.gitorious.org/evol/evol-music/blobs/master/LICENSE
# Folder
authors' nick - music name (License) (Contributors' Nick)
-# Gui Icons
-## Flags
- bartk - in the forest of the birches.ogg (CC BY 4.0) (Socapex)
- bartk - the adventure begins.ogg (CC BY 4.0) (Socapex)
- ezili - ocean sounds.ogg (CC BY 4.0) (Socapex)
- eric matyas - ghoulish fun.ogg (CC BY 4.0) (Riqqi)
- eric matyas - surreal place.ogg (CC BY 4.0) (Riqqi)
+# music
+ bartk - in the forest of the birches.ogg (CC BY 4.0) (Socapex)
+ bartk - the adventure begins.ogg (CC BY 4.0) (Socapex)
+ ezili - ocean sounds.ogg (CC BY 4.0) (Socapex)
+ eric matyas - ghoulish fun.ogg (CC BY 4.0) (Riqqi)
+ eric matyas - surreal place.ogg (CC BY 4.0) (Riqqi)
+ magick-real.ogg (Aasif Chaudry) (GPLv2, CC SA 3.0) (?)
+ the-forest.ogg (GPLv2) (?)
diff --git a/music/magick-real.ogg b/music/magick-real.ogg
new file mode 100644
index 0000000..0b43709
--- /dev/null
+++ b/music/magick-real.ogg
Binary files differ
diff --git a/music/the-forest.ogg b/music/the-forest.ogg
new file mode 100644
index 0000000..b8adf02
--- /dev/null
+++ b/music/the-forest.ogg
Binary files differ