diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
| commit | db53017bd8172d7679b2ce3e7cc6c67927031f2c (patch) | |
| tree | 6777db7b72f0329937f17153ddfa3567695d45ea /npc/022-1/_import.txt | |
| parent | c0fa45992b123f08e91e86dac11aca765ea73cd2 (diff) | |
| parent | 246072120a1edcba61a350bad56049f110457489 (diff) | |
| download | serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.gz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.bz2 serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.xz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.zip | |
Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata
Conflicts:
db/const.txt
npc/022-1_Tulimshar/_import.txt
npc/_import.txt
Diffstat (limited to 'npc/022-1/_import.txt')
| -rw-r--r-- | npc/022-1/_import.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/022-1/_import.txt b/npc/022-1/_import.txt index f0e9cc73..8f72cbc0 100644 --- a/npc/022-1/_import.txt +++ b/npc/022-1/_import.txt @@ -1,9 +1,9 @@ -// Map 022-1: Tulimshar // 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 -npc: npc/022-1/_warps.txt -npc: npc/022-1/dock.txt -npc: npc/022-1/elanore.txt -npc: npc/022-1/ferry_master.txt -npc: npc/022-1/mapflags.txt +npc: npc/022-1_Tulimshar/_mobs.txt +npc: npc/022-1_Tulimshar/_warps.txt +npc: npc/022-1_Tulimshar/dock.txt +npc: npc/022-1_Tulimshar/elanore.txt +npc: npc/022-1_Tulimshar/ferry_master.txt +npc: npc/022-1_Tulimshar/mapflags.txt +npc: npc/022-1_Tulimshar/tutorial.txt |