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/021-1_Tulimshar/_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/021-1_Tulimshar/_import.txt')
| -rw-r--r-- | npc/021-1_Tulimshar/_import.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt index e6939894..c64daf4b 100644 --- a/npc/021-1_Tulimshar/_import.txt +++ b/npc/021-1_Tulimshar/_import.txt @@ -5,7 +5,7 @@ npc: npc/021-1_Tulimshar/bakery.txt npc: npc/021-1_Tulimshar/eurni.txt npc: npc/021-1_Tulimshar/gate_guards.txt npc: npc/021-1_Tulimshar/inac.txt -npc: npc/021-1_Tulimshar/magic_school.txt npc: npc/021-1_Tulimshar/north_shops.txt npc: npc/021-1_Tulimshar/royal_guards.txt +npc: npc/021-1_Tulimshar/weellos.txt npc: npc/021-1_Tulimshar/workers.txt |