diff options
author | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
commit | 6967b9e0b63d19141d4f59b7933a960ac81916d0 (patch) | |
tree | 8ecd9cd2461f3598cb7faece71eb77162aa4ef2a /npc/007-2/_import.txt | |
parent | 9877fd4ad81120af8e63e96d5d429092014dc017 (diff) | |
parent | 046c659193e1ca8bd13478678d1277df8bf9395c (diff) | |
download | serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.gz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.bz2 serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.xz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.zip |
Merge branch 'master' into legacy
Override all files with 'master' version.
This version is meant to preserve git history as requested by bjorn.
Diffstat (limited to 'npc/007-2/_import.txt')
-rw-r--r-- | npc/007-2/_import.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/npc/007-2/_import.txt b/npc/007-2/_import.txt new file mode 100644 index 00000000..ec867053 --- /dev/null +++ b/npc/007-2/_import.txt @@ -0,0 +1,4 @@ +// Map 007-2: Illia forsaken inn +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/007-2/_warps.txt", +"npc/007-2/witch.txt", |