diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/043-3/_import.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/043-3/_import.txt')
| -rw-r--r-- | world/map/npc/043-3/_import.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/world/map/npc/043-3/_import.txt b/world/map/npc/043-3/_import.txt new file mode 100644 index 00000000..027beecc --- /dev/null +++ b/world/map/npc/043-3/_import.txt @@ -0,0 +1,5 @@ +// Map 043-3: Cave +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 043-3.gat +npc: npc/043-3/_mobs.txt +npc: npc/043-3/_warps.txt |