summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2020-02-03 20:10:02 +0000
committerMicksha <ms-shaman@gmx.de>2020-02-03 20:10:02 +0000
commit4467d16822a7502531b0d86e07f14ba891b43c4b (patch)
treecc2b3195cca1c284f9acae964f42a1f2a415e5d1 /LICENSE
parentcea6dbb48079adc2f5eca1de35a5ba8ce88dee36 (diff)
parent832b3df4925f13e1ca86ba80b14f115937665188 (diff)
downloadclientdata-4467d16822a7502531b0d86e07f14ba891b43c4b.tar.gz
clientdata-4467d16822a7502531b0d86e07f14ba891b43c4b.tar.bz2
clientdata-4467d16822a7502531b0d86e07f14ba891b43c4b.tar.xz
clientdata-4467d16822a7502531b0d86e07f14ba891b43c4b.zip
Merge branch 'arrivalargaes' into 'master'
Arrivalin Argaes See merge request evol/clientdata!136
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 2a9603f3..882827f4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -140,6 +140,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
## Generic
graphics/items/generic/adventurersoul.png (Micksha) (CC BY-SA 3.0) (idea by TMW-BR?)
graphics/items/generic/bottle-empty.png (FotherJ, Enchilado) (CC BY-SA 3.0,GPLv2) (Micksha)
+ graphics/items/generic/bowl-empty.png (Micksha) (CC BY-SA 3.0) (-)
graphics/items/generic/box-aquada.png (Hal9000) (CC BY-SA 3.0) (Reid)
graphics/items/generic/box-croconut.png (Hal9000) (CC BY-SA 3.0) (Reid)
graphics/items/generic/box-fish.png (Hal9000) (CC BY-SA 3.0) (Reid)
@@ -204,6 +205,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/items/usable/book-old.png (Reid) (CC BY-SA 3.0) (-)
graphics/items/usable/book-pioufluffy.png (Hal9000) (CC BY-SA 3.0) (Reid)
graphics/items/usable/book-poem.png (Reid) (CC BY-SA 3.0) (-)
+ graphics/items/usable/bowl-sailorstew.png (Micksha) (CC BY-SA 3.0) (-)
graphics/items/usable/bread.png (Coolkid782) (CC BY-SA 3.0) (-)
graphics/items/usable/carrot.png (Enchilado) (CC BY-SA 3.0) (Reid)
graphics/items/usable/cheese.png (Reid) (CC BY-SA 3.0) (-)