summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2017-08-19 02:33:32 +0200
committerReid <reidyaro@gmail.com>2017-08-19 02:33:32 +0200
commitc033236376f116527f5df0668478d1f1ace392ef (patch)
treeefc23fa99440e98d461728acc1f2137670ef8181 /LICENSE
parentfe1af8fc16d141d87d20f47c34fca88dc38d3e0a (diff)
parent0e9ec9e259cc5d80f0a7d01e73d5bdd274f23696 (diff)
downloadclientdata-c033236376f116527f5df0668478d1f1ace392ef.tar.gz
clientdata-c033236376f116527f5df0668478d1f1ace392ef.tar.bz2
clientdata-c033236376f116527f5df0668478d1f1ace392ef.tar.xz
clientdata-c033236376f116527f5df0668478d1f1ace392ef.zip
Merge branch 'Alige/clientdata-cliff-stairs'
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE10
1 files changed, 7 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index be120e44..381ea902 100644
--- a/LICENSE
+++ b/LICENSE
@@ -425,16 +425,17 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/heads/ukar-male-default.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc)
# Tilesets
- graphics/tilesets/accessory.png (Alige, Coolkid782, Hal9000, Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/accessory.png (Alige, Coolkid782, Hal9000, Len, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-accessory.png (EJlol, IvanMorve, Len, Reid) (CC BY-SA 3.0) (Saweres)
graphics/tilesets/artis-accessory-x1x2.png (EJlol, IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-archway-x1x4.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-archway-x1x5.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
- graphics/tilesets/artis-blockwall.png (Hal9000, Reid) (CC BY-SA 3.0) (-)
- graphics/tilesets/artis-bridge.png (Hal9000) (CC BY-SA 3.0) (EJlol, Reid)
+ graphics/tilesets/artis-blockwall.png (Hal9000, Reid) (CC BY-SA 3.0) (Alige)
+ graphics/tilesets/artis-bridge.png (Hal9000) (CC BY-SA 3.0) (Alige, EJlol, Reid)
graphics/tilesets/artis-chimney.png (Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-dock.png (Reid) (CC BY-SA 3.0) (Alige)
graphics/tilesets/artis-fence.png (Reid) (CC BY-SA 3.0) (Kestrel)
+ graphics/tilesets/artis-fountain-x3x2.png (Alige, IvanMorve) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-fountain.png (Bagzie) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-fountain-x1x4.png (Bagzie) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-harbour-x4x2.png (EJlol, Reid) (CC BY-SA 3.0) (-)
@@ -448,6 +449,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/artis-indoor-x1x3.png (Reid, Nard) (CC BY-SA 3.0) (Bagzie)
graphics/tilesets/artis-indoor-x1x4.png (Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-indoor-x2x4.png (Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/artis-lamps.png (Alige) (CC BY-SA 3.0) (Reid)
+ graphics/tilesets/artis-lamps-x1x3.png (Alige) (CC BY-SA 3.0) (Reid)
graphics/tilesets/artis-market.png (EJlol, IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-pavement.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-pillar-x1x2.png (Reid) (CC BY-SA 3.0) (Kestrel)
@@ -468,6 +471,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/ship-indoor.png (Lunovox) (GPLv2) (Reid, Saci)
graphics/tilesets/ship-indoor-fringe.png (Crush) (CC BY-SA 3.0) (Reid, Yosuhara)
graphics/tilesets/ship-indoor-x2x4.png (Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/ship-flags.png (Alige) (CC BY-SA 3.0) (Reid)
graphics/tilesets/ship-mast.png (Lunovox, Reid) (GPLv2) (Alige, Hal9000, Saci)
graphics/tilesets/ship-sunlight-x1x5.png (Len) (CC BY-SA 3.0) (Reid)
graphics/tilesets/tree-x3x3.png (Hal9000) (CC BY-SA 3.0) (Reid)