diff options
author | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
---|---|---|
committer | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
commit | 5e3b3ca60fd86cc0872901dcd888d20077c040a0 (patch) | |
tree | c4260b129e4ca6105559017fa09f3c02294fd397 /maps/010-1.tmx | |
parent | a1d23a0a3dae86aa3a20a0fe3fbb4e953045427a (diff) | |
parent | c3a4cf5300255bb08c50827b89baceccc42bdd3a (diff) | |
download | clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.gz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.bz2 clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.xz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.zip |
Merge branch 'real-master' into fresh-master
Conflicts:
graphics/sprites/head-deserthat.xml
Diffstat (limited to 'maps/010-1.tmx')
-rw-r--r-- | maps/010-1.tmx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maps/010-1.tmx b/maps/010-1.tmx index 017c5a45..5dfe57e9 100644 --- a/maps/010-1.tmx +++ b/maps/010-1.tmx @@ -88,7 +88,7 @@ </object> <object name="ToWoodland" type="warp" x="1760" y="3328" width="96" height="32"> <properties> - <property name="dest_map" value="015-1"/> + <property name="dest_map" value="016-1"/> <property name="dest_x" value="1808"/> <property name="dest_y" value="688"/> </properties> |