diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
| commit | e5ac95f237d5c96c39e3b5573d198138f855e30d (patch) | |
| tree | 09f6b19c3b119d563e3207c2901ce2cc506ee1bb /npc/_import.txt | |
| parent | 2a73e3544d6ac4d4f000c621753d70e8695e203c (diff) | |
| parent | b073a508fb4c61ed3cb4f4cc62fc3d892480a6b8 (diff) | |
| download | serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.gz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.bz2 serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.xz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.zip | |
Merge commit 'mainline/master'
Conflicts:
data/021-2.wlk
data/023-1.wlk
Diffstat (limited to 'npc/_import.txt')
| -rw-r--r-- | npc/_import.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index 416fff95..9b3acaf8 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -41,7 +41,8 @@ import: npc/020-2_Nivalis/_import.txt import: npc/020-3_Ice_cave/_import.txt import: npc/020-4_Ice_cave/_import.txt import: npc/021-1_Tulimshar/_import.txt -//import: npc/021-2/_import.txt -//import: npc/021-8_Meeting_Rooms/_import.txt -//import: npc/023-1_Beach_Cliffs/_import.txt +import: npc/021-2_Tulimshar/_import.txt +import: npc/023-1_Beach_Cliffs/_import.txt +import: npc/024-1_Tulimshar_Canyon/_import.txt +import: npc/024-2_Tulimshar_Magic_School/_import.txt import: npc/botcheck/_import.txt |