diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
commit | 7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch) | |
tree | e4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /world/map/npc/_import.txt | |
parent | 8ac35610a416d3937ccf4b3b74a61622382e8162 (diff) | |
parent | fa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff) | |
download | serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2 serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/_import.txt')
-rw-r--r-- | world/map/npc/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index c16ab26e..05d7791e 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -83,6 +83,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/034-2/_import.txt import: npc/041-1/_import.txt import: npc/042-1/_import.txt import: npc/042-2/_import.txt |