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/021-1/_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/021-1/_import.txt')
| -rw-r--r-- | world/map/npc/021-1/_import.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt index 30acb5b8..9fa30a77 100644 --- a/world/map/npc/021-1/_import.txt +++ b/world/map/npc/021-1/_import.txt @@ -7,12 +7,12 @@ npc: npc/021-1/bakery.txt npc: npc/021-1/banu.txt npc: npc/021-1/eurni.txt npc: npc/021-1/gate_guards.txt +npc: npc/021-1/hetchel.txt npc: npc/021-1/hideandseek.txt npc: npc/021-1/imec.txt npc: npc/021-1/inac.txt npc: npc/021-1/mapflags.txt npc: npc/021-1/north_shops.txt npc: npc/021-1/npcs.txt -npc: npc/021-1/royal_guards.txt npc: npc/021-1/weellos.txt npc: npc/021-1/workers.txt |