summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2017-08-19 02:08:28 +0200
committerReid <reidyaro@gmail.com>2017-08-19 02:08:28 +0200
commit65ccc9f53ef4cca7c8766f6b0538738c8f386074 (patch)
tree88af1f36f719d3f5f1f997cd47d3ba7b5edacf00 /LICENSE
parent778403069b4f165bfc6bfcf717e4fb68be6e921f (diff)
parentd46ca8c5ed6fae18b4f3418eef3c4c60dc5f2ad7 (diff)
downloadclientdata-65ccc9f53ef4cca7c8766f6b0538738c8f386074.tar.gz
clientdata-65ccc9f53ef4cca7c8766f6b0538738c8f386074.tar.bz2
clientdata-65ccc9f53ef4cca7c8766f6b0538738c8f386074.tar.xz
clientdata-65ccc9f53ef4cca7c8766f6b0538738c8f386074.zip
Merge branch 'Micksha/clientdata-sewer'
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE5
1 files changed, 5 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 627ceaca..1ac27fb5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -461,6 +461,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/collision.png (Reid) (CC BY-SA 3.0) (4144)
graphics/tilesets/ground.png (Bagzie, IvanMorve, Len, Reid) (CC BY-SA 3.0) (Crush)
graphics/tilesets/level-number.png (Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/sewer.png (EJlol, Hal9000, Micksha, Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/sewer-x2x2.png (EJlol, Hal9000, Micksha, Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/sewer-x3x3.png (EJlol, Hal9000, Micksha, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/shadow.png (Reid) (CC BY-SA 3.0) (Hal9000)
graphics/tilesets/ship-base.png (Lunovox) (GPLv2) (Hal9000, Reid, Saci)
graphics/tilesets/ship-indoor.png (Lunovox) (GPLv2) (Reid, Saci)
@@ -550,6 +553,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
maps/001-2-40.tmx (Reid) (CC BY-SA 3.0) (-)
maps/001-2-41.tmx (Reid) (CC BY-SA 3.0) (-)
maps/001-2-42.tmx (Reid) (CC BY-SA 3.0) (Tezer)
+ maps/001-3-0.tmx (Micksha) (CC BY-SA 3.0) (-)
+ maps/001-3-1.tmx (Micksha) (CC BY-SA 3.0) (-)
maps/008-1.tmx (Crush) (CC BY-SA 3.0) (gumi, wushin)
maps/008-2-0.tmx (gumi, Tezer) (CC BY-SA 3.0) (gumi)
maps/008-2-1.tmx (Crush, Jaxad0127) (CC BY-SA 3.0) (gumi)