diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/022-1 | |
parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/022-1')
-rw-r--r-- | world/map/npc/022-1/_import.txt | 2 | ||||
-rw-r--r-- | world/map/npc/022-1/_mobs.txt | 2 | ||||
-rw-r--r-- | world/map/npc/022-1/_warps.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/022-1/_import.txt b/world/map/npc/022-1/_import.txt index 7fd59b12..11b375cf 100644 --- a/world/map/npc/022-1/_import.txt +++ b/world/map/npc/022-1/_import.txt @@ -1,4 +1,4 @@ -// Map 022-1: Tulimshar +// Map 022-1: Tulimshar Port // This file is generated automatically. All manually changes will be removed when running the Converter. map: 022-1.gat npc: npc/022-1/_mobs.txt diff --git a/world/map/npc/022-1/_mobs.txt b/world/map/npc/022-1/_mobs.txt index 650feecc..92b81a81 100644 --- a/world/map/npc/022-1/_mobs.txt +++ b/world/map/npc/022-1/_mobs.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Tulimshar mobs +// Tulimshar Port mobs diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt index 3b840d83..ef720469 100644 --- a/world/map/npc/022-1/_warps.txt +++ b/world/map/npc/022-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Tulimshar warps +// Tulimshar Port warps 022-1.gat,72,108|warp|ToCentralTulimshar|3,-1,021-1.gat,73,21 022-1.gat,113,108|warp|ToCentralTulimshar|3,-1,021-1.gat,113,21 |