diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-03-20 22:59:29 +0100 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-03-20 23:01:44 +0100 |
commit | 00a9c6ae0f6c0808e73929cb81ba8777927654d7 (patch) | |
tree | 44bfeac6de66cbae9b6357336866deae3275857d /world/map/npc/008-1/_import.txt | |
parent | 554c243e71e60f8c1ddf09da5c20695eaf06e77e (diff) | |
parent | 22c00753de1e821fd41323de4e335e7a89042495 (diff) | |
download | serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.gz serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.bz2 serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.xz serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.zip |
Merge branch 'easter'
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/008-1/_import.txt')
-rw-r--r-- | world/map/npc/008-1/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt index 419b018b..7361a1bf 100644 --- a/world/map/npc/008-1/_import.txt +++ b/world/map/npc/008-1/_import.txt @@ -8,3 +8,4 @@ npc: npc/008-1/diryn.txt npc: npc/008-1/dock.txt npc: npc/008-1/george.txt npc: npc/008-1/hinnak.txt +npc: npc/008-1/annualeaster.txt |