summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko <mikko.devel@gmail.com>2015-02-08 18:20:33 +0200
committerMikko <mikko.devel@gmail.com>2015-02-08 18:20:33 +0200
commitd4501c3f8ae1a030950dd8fc258ca8bd61363fdc (patch)
treea2f632275c5e966fe881f23023d887f7e1a89da9
parentcd67c4bc0f308bf880c77baf76a2a2ccd19ecbc6 (diff)
parent9636d12007c8d1c61611dd5377a365e8e128ca67 (diff)
downloadclientdata-d4501c3f8ae1a030950dd8fc258ca8bd61363fdc.tar.gz
clientdata-d4501c3f8ae1a030950dd8fc258ca8bd61363fdc.tar.bz2
clientdata-d4501c3f8ae1a030950dd8fc258ca8bd61363fdc.tar.xz
clientdata-d4501c3f8ae1a030950dd8fc258ca8bd61363fdc.zip
Merge branch 'master' of gitorious.org:evol/clientdata
-rw-r--r--LICENSE1
-rw-r--r--graphics/tilesets/artis-harbour-x6-x4.pngbin0 -> 20988 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 3770b2b3..ba904495 100644
--- a/LICENSE
+++ b/LICENSE
@@ -291,6 +291,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/artis-fountain.png (Bagzie) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-harbour-x2-x4.png (EJlol, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-harbour-x4-x6.png (EJlol, Reid) (CC BY-SA 3.0) (-)
+ graphics/tilesets/artis-harbour-x6-x4.png (EJlol, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-house.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-indoor.png (Reid) (CC BY-SA 3.0) (IvanMorve, Lien)
graphics/tilesets/artis-indoor-cellar.png (Hal9000, Reid) (CC BY-SA 3.0) (-)
diff --git a/graphics/tilesets/artis-harbour-x6-x4.png b/graphics/tilesets/artis-harbour-x6-x4.png
new file mode 100644
index 00000000..441e4288
--- /dev/null
+++ b/graphics/tilesets/artis-harbour-x6-x4.png
Binary files differ