summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2019-03-29 17:01:59 +0000
committerMicksha <ms-shaman@gmx.de>2019-03-29 17:01:59 +0000
commit5aad86f1e2000d6bd43547700a657244cb9985e3 (patch)
tree328b5d14f5c0953167611db0394311b904ffbe61 /LICENSE
parent801c9c63bab42ac9b1bffb2ec36e6b739147390a (diff)
parent3b717afcb7162432d44a258545ce9dc674455b0d (diff)
downloadclientdata-5aad86f1e2000d6bd43547700a657244cb9985e3.tar.gz
clientdata-5aad86f1e2000d6bd43547700a657244cb9985e3.tar.bz2
clientdata-5aad86f1e2000d6bd43547700a657244cb9985e3.tar.xz
clientdata-5aad86f1e2000d6bd43547700a657244cb9985e3.zip
Merge branch 'calamity' into 'master'
Jesusalva' Calamity Dungeon See merge request evol/clientdata!97
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE1
1 files changed, 1 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 4c404b4b..94d9c5b2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -777,6 +777,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
maps/008-2-23.tmx (Micksha) (CC BY-SA 3.0) (-)
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) (-)
# Sound Effects
## Monsters