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/_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/_import.txt')
| -rw-r--r-- | npc/_import.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index b3bcc75a..f6da80e5 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -77,4 +77,7 @@ import: npc/032-1/_import.txt import: npc/032-3/_import.txt import: npc/033-1/_import.txt import: npc/034-1/_import.txt +import: npc/041-1/_import.txt +import: npc/042-1/_import.txt +import: npc/042-2/_import.txt import: npc/botcheck/_import.txt |