summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2020-04-05 07:03:51 +0000
committerMicksha <ms-shaman@gmx.de>2020-04-05 07:03:51 +0000
commitde8cfebcd6bfe491f931d7f444dca4a368e7df2d (patch)
tree1fd724756752705c19ee47f5cf34777e5754930e /LICENSE
parentdf8f011a8b568369a30d6ce8805c0f014583eccd (diff)
parente59ec7dba8b930ae132d3564d55a24fdec0319b1 (diff)
downloadclientdata-de8cfebcd6bfe491f931d7f444dca4a368e7df2d.tar.gz
clientdata-de8cfebcd6bfe491f931d7f444dca4a368e7df2d.tar.bz2
clientdata-de8cfebcd6bfe491f931d7f444dca4a368e7df2d.tar.xz
clientdata-de8cfebcd6bfe491f931d7f444dca4a368e7df2d.zip
Merge branch 'jail' into 'master'
add kytty's jail as per jesusalva request See merge request evol/clientdata!140
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE1
1 files changed, 1 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 8d43d655..0fa53f25 100644
--- a/LICENSE
+++ b/LICENSE
@@ -926,6 +926,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
maps/008-3-0.tmx (Micksha) (CC BY-SA 3.0) (-)
maps/008-3-1.tmx (Micksha) (CC BY-SA 3.0) (-)
maps/008-4-1.tmx (Jesusalva) (CC BY-SA 3.0) (-)
+ maps/jail.tmx (Kytty) (CC BY-SA 3.0) (Micksha)
# Sound Effects
## Monsters