From 6b4d074458c84789aa6f20f6c0a7e9b4929f833a Mon Sep 17 00:00:00 2001 From: Tails2091 Date: Sat, 23 Mar 2019 15:46:37 -0400 Subject: [PATCH] Merged license.txt files. --- sound/Attributions.txt | 6 +++++- sound/ambience/license.txt | 2 -- sound/creatures/license.txt | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 sound/ambience/license.txt delete mode 100644 sound/creatures/license.txt diff --git a/sound/Attributions.txt b/sound/Attributions.txt index 262699e9c3f..729562855ba 100644 --- a/sound/Attributions.txt +++ b/sound/Attributions.txt @@ -1 +1,5 @@ -items/thermal_drill.ogg was sampled from Builders Drilling.wav under a Sampling Plus 1.0 license. It was uploaded by Koops on 2010-05-10. Source (http://soundbible.com/1420-Builders-Drilling.html) \ No newline at end of file +items/thermal_drill.ogg was sampled from Builders Drilling.wav under a Sampling Plus 1.0 license. It was uploaded by Koops on 2010-05-10. Source (http://soundbible.com/1420-Builders-Drilling.html) + +ambience/aurora_caelus.ogg is Music for Manatees by Kevin Macleod. It is under a CC-BY 3.0 license. It has been cropped and fades out. + +creatures/dog_yelp.ogg is DogYelp.wav. It is under a CC-BY 3.0 license. It has been cropped, EQ'd, and compressed to .ogg. Source (https://freesound.org/people/TobiasKosmos/sounds/163280/) \ No newline at end of file diff --git a/sound/ambience/license.txt b/sound/ambience/license.txt deleted file mode 100644 index 5376422f21f..00000000000 --- a/sound/ambience/license.txt +++ /dev/null @@ -1,2 +0,0 @@ -aurora_caelus.ogg is Music for Manatees, by Kevin Macleod. It has been licensed under CC-BY 3.0 license. - It has been cropped for use ingame, and also fades out. \ No newline at end of file diff --git a/sound/creatures/license.txt b/sound/creatures/license.txt deleted file mode 100644 index 119e4e3d21c..00000000000 --- a/sound/creatures/license.txt +++ /dev/null @@ -1,2 +0,0 @@ -dog_yelp.ogg is DogYelp.wav, by TobiasKosmos (https://freesound.org/people/TobiasKosmos/sounds/163280/). It has been licensed under CC-BY 3.0 license. -It has been cropped, EQ'd, and compressed to .ogg for in-game use. \ No newline at end of file