Mercurial > vanillian

changeset 48:eeb43b94f625 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Makdaam
date Sun, 16 Dec 2012 19:50:44 +0100
parents 1907b4771d29 (current diff) 91579ea77152 (diff)
children
files
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/cellar.tmx	Sun Dec 16 19:50:08 2012 +0100
+++ b/cellar.tmx	Sun Dec 16 19:50:44 2012 +0100
@@ -46,7 +46,7 @@
  </layer>
  <layer name="furniture" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBhewAaKKQHWaGwnKKYFsEazbxSQDsyB2AKILalopi0Q2wGxPRXNpBQ4DLQDaABAcUfNeKM3AAC+6QP7
+   eJxjYBi6wA+LmA0UUwKs0dhOUEwLYI1m3yggHZgDsQUQW1LRTFsgtgNieyqaSSlwGGgH0ACA4o6a8UZvAAAfPwRJ
   </data>
  </layer>
  <layer name="furniture2" width="21" height="16">
Binary file furniture.png has changed
--- a/lab.tmx	Sun Dec 16 19:50:08 2012 +0100
+++ b/lab.tmx	Sun Dec 16 19:50:44 2012 +0100
@@ -51,7 +51,7 @@
  </layer>
  <layer name="furniture2" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgcQJlIMVKBJ5T2BmIvKpg3CkbBKBgFMAAAEo8BJQ==
+   eJxjYBgcQBlK+2ERowR4QmlvIPaignmjYPgBP8JKRsEowAoALpUBwQ==
   </data>
  </layer>
  <objectgroup name="mobs" width="21" height="16">
@@ -86,7 +86,7 @@
    <property name="overlay" value="1"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJzjZWBg4CUS8wCxLAEsR4I+kFpBBsKAG4uZuPRxk2Amurv4cajlwyNHjt2kgOFoJgcQc5JhpjAQiwCxKJTPjmSeBJH2o5spD8QKQKwI5SshqQOlMyEgFodiZDdzIIkTazcoHaHnAX4c8sTmDVIAreIdOYyQMTFxjMtMXGUQLrsIYQk8ZlKCARXhCpM=
+   eJzjZWBg4CUS8wCxLAEsR4I+kFpBBsKAG4uZuPRxk2Amurv4cajlwyNHjt2kgOFoJgcQc5JhpjAQiwCxKJTPjmSeBJH2k5I+QOlMCIjFoRjZzRxI4sTaDUpH6HmAH4c8sXmDFECreEcOI2RMTBzjMhNXGYTLLkJYAo+ZlGAA9OsKEQ==
   </data>
  </layer>
  <layer name="control" width="21" height="16">
--- a/town.tmx	Sun Dec 16 19:50:08 2012 +0100
+++ b/town.tmx	Sun Dec 16 19:50:44 2012 +0100
@@ -41,7 +41,7 @@
  </tileset>
  <layer name="floor" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJy1kkEKwCAMBE3pJ2qFemn7/x/2JIQQ12Shh0EQHTarUkoRxaa4FXpfkljn4zg7wPpaMGcFsDl3gPX1YM6MsxI5R48zZ7TPA/R5kn2uWDm9nBnnBXJmiPT5Jlc0u52fyYk6su/LvhFzzp5tzt2B/pPeH/ybDyVlD64=
+   eJy1klEKwDAIQ+vYJdYVWhjb7n/DfRUkSKrCPh4FsSFGpZQiik1xK3RdgqDmY2gOAuo1p89KyPrcCag3nD4jmjWQ52VkOWuZPA+S55nMc8VK0/IZ0ezEZwRPnm/wZbPj/BmfLCPcb3ZHmT7sbcbfib5J6wb/5gN2kxBf
   </data>
  </layer>
  <layer name="furniture" width="21" height="16">
@@ -51,7 +51,7 @@
  </layer>
  <layer name="furniture2" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgF1Aa+A+2AYQS8B9oBwwwM5bTpi4NNqVpKAADtqgIa
+   eJxjYBgF1Aa+A+0AJOCHgz1UgPdAO2CYgcGUNkkFvjjYlKqlBAAA+KACtg==
   </data>
  </layer>
  <objectgroup name="mobs" width="21" height="16">
@@ -194,7 +194,7 @@
    <property name="overlay" value="1"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYEAAdgbiADcQ8+LByECJBmYSCwbaTGLDkw+IZfFgZEBseMoDsTIQKyCJKWARG0qA2PAkBRAbnsMR4AtPYSAWgWJREszEF56gNKkAxYokmDmYAQCK6QSr
+   eJxjYEAAdgbiADcQ8+LByECJBmYSCwbaTGLDkw+IZfFgZEBseA5HQGx4kgJGwxM7EAZiESgWJcFMfOEpD8QKUKxIgpmDGQAA9ogD5g==
   </data>
  </layer>
  <layer name="control" width="21" height="16">