summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2019-10-16 15:10:34 +0000
committerMicksha <ms-shaman@gmx.de>2019-10-16 15:10:34 +0000
commita665674de5aba11780cf855382fc8111c8f7c560 (patch)
treeb3e68f2903637833abc42766acde69834709dd2f /LICENSE
parentf65cf2f25330922941cacb5e1fa1111b4beb4b16 (diff)
parent061730964f6279b4fdea147518c884f75e75af15 (diff)
downloadclientdata-a665674de5aba11780cf855382fc8111c8f7c560.tar.gz
clientdata-a665674de5aba11780cf855382fc8111c8f7c560.tar.bz2
clientdata-a665674de5aba11780cf855382fc8111c8f7c560.tar.xz
clientdata-a665674de5aba11780cf855382fc8111c8f7c560.zip
Merge branch 'jesusalva/207' into 'master'
Jesusalva/207 See merge request evol/clientdata!132
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index d077f6b5..43cae6b2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -130,6 +130,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/items/equipment/weapons/wand.png (Micksha) (CC BY-SA 3.0) (-)
## 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/box-aquada.png (Hal9000) (CC BY-SA 3.0) (Reid)
graphics/items/generic/box-croconut.png (Hal9000) (CC BY-SA 3.0) (Reid)
@@ -229,6 +230,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/items/usable/potion2.png (Reid) (CC BY-SA 3.0) (Micksha)
graphics/items/usable/potion3.png (Reid) (CC BY-SA 3.0) (Micksha)
graphics/items/usable/potion4.png (Reid) (CC BY-SA 3.0) (Micksha)
+ graphics/items/usable/potiondeath.png (Micksha) (CC BY-SA 3.0) (idea by TMW-BR?)
graphics/items/usable/pumpkinjuice.png (Enchilado) (CC BY-SA 3.0) (Reid)
graphics/items/usable/pumpkinseeds.png (Enchilado) (CC BY-SA 3.0) (-)
graphics/items/usable/roastedmaggot.png (LEGACY) (CC BY-SA 3.0) (Micksha)