summaryrefslogtreecommitdiff
path: root/license.txt
diff options
context:
space:
mode:
authortux9th <mr.x@aon.at>2013-12-17 10:54:35 -0800
committertux9th <mr.x@aon.at>2013-12-17 10:54:35 -0800
commit23bb3efab57b5197f9f4428937dc169c029e7b4a (patch)
tree062ca62ce19fe0af88fe3dfffd1f4a76a8fe559f /license.txt
parentafe28a5840f53787a91333691ee519939b9fe4e8 (diff)
parent43b537aa27921529beddf33afab9c8db5e5f5911 (diff)
downloadclientdata-23bb3efab57b5197f9f4428937dc169c029e7b4a.tar.gz
clientdata-23bb3efab57b5197f9f4428937dc169c029e7b4a.tar.bz2
clientdata-23bb3efab57b5197f9f4428937dc169c029e7b4a.tar.xz
clientdata-23bb3efab57b5197f9f4428937dc169c029e7b4a.zip
Merge pull request #42 from fother/trolls
Diffstat (limited to 'license.txt')
-rw-r--r--license.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/license.txt b/license.txt
index 2a2ff503..6ea747b0 100644
--- a/license.txt
+++ b/license.txt
@@ -509,6 +509,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/particles/mist-face-a.png (Nmaligec) (GPLv2)
graphics/particles/mist-face-b.png (Nmaligec) (GPLv2)
graphics/particles/monster-ball-lightning.particle.png (????) (GPLv2)
+ graphics/particles/monster-troll-foefire.particle.png (FotherJ) (GPLv2), (CC BY-SA 3.0)
graphics/particles/orb-large.png (Crush) (GPLv2), (CC BY-SA 3.0)
graphics/particles/orb-medium.png (Crush) (GPLv2), (CC BY-SA 3.0)
graphics/particles/orb-small.png (Crush) (GPLv2), (CC BY-SA 3.0)
@@ -807,6 +808,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/sprites/monsters/squirrel.png (FotherJ, Wombat) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/monsters/terranite-mask.png (Kr0n05931) (GPLv2)
graphics/sprites/monsters/terranite.png (Kr0n05931) (GPLv2)
+ graphics/sprites/monsters/troll.png (FotherJ) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/monsters/vampire-bat.png (Meway) (GPLv2)
graphics/sprites/monsters/vespa.png (Arikel) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/monsters/wisp.png (Crush) (GPLv2), (CC BY-SA 3.0)