summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorchristopherchay <chay.c2.christopher@gmail.com>2019-02-09 15:13:22 -0500
committerchristopherchay <chay.c2.christopher@gmail.com>2019-02-09 15:13:22 -0500
commit758bf6e6037b145d52656e1f4cce2559db59ba0e (patch)
tree7ede1e6bcf6f9e0f850afa665cd7d04baa638ffb /LICENSE
parent7fe28b1ce236ccbfd0262646b3647dfcb19eabce (diff)
parentc6f0d9e089c507fa9ba9cf6918f5a8d36984e10a (diff)
downloadclientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.tar.gz
clientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.tar.bz2
clientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.tar.xz
clientdata-758bf6e6037b145d52656e1f4cce2559db59ba0e.zip
Merge branch 'master' of gitlab.com:TMW2/clientdata
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE3
1 files changed, 3 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index e6c9494c..a3e935b1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -659,6 +659,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/usable/aquada.png (Reid) (CC BY-SA 3.0) (-)
graphics/items/usable/bigpumpkinseed.png (Saulc) (CC BY-SA 3.0) (Enchilado)
graphics/items/usable/blobime.png (Enchilado) (CC BY-SA 3.0) (-)
+ graphics/items/usable/boxofchocolates.png (?) (GPL 2.0 or later) (TMW Org.)
graphics/items/usable/bugleg.png (Enchilado) (GPLv2) (-)
graphics/items/usable/croconut.png (Hal9000) (CC BY-SA 3.0) (-)
graphics/items/usable/curshroom.png (Reid) (CC BY-SA 3.0) (-)
@@ -829,6 +830,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/minimaps/001-9.png (Jesusalva) (GPLv3) (Jesusalva)
graphics/minimaps/001-10.png (Jesusalva) (GPLv3) (Jesusalva)
graphics/minimaps/001-10-1.png (Jesusalva) (GPLv3) (Jesusalva)
+ graphics/minimaps/001-11.png (Jesusalva) (GPLv3) (Jesusalva)
graphics/minimaps/002-1.png (Reid) (CC BY-SA 3.0) (-)
graphics/minimaps/002-2.png (Reid) (CC BY-SA 3.0) (-)
graphics/minimaps/002-3.png (Reid) (CC BY-SA 3.0) (-)
@@ -1853,6 +1855,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
maps/001-9.tmx (LoF) (CC BY-SA 3.0) (-)
maps/001-10.tmx (?) (GPLv2) (jesusalva, TMW Org.)
maps/001-10-1.tmx (?) (GPLv2) (jesusalva, TMW BR)
+ maps/001-11.tmx (jesusalva) (GPLv2) (TMW-BR)
maps/002-1.tmx (Reid, Saulc) (CC BY-SA 3.0) (jesusalva)
maps/002-2.tmx (Reid) (CC BY-SA 3.0) (Saulc, Rakinorf, jesusalva)
maps/002-3.tmx (Reid) (CC BY-SA 3.0) (Saulc, jesusalva)