diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-08-24 14:53:22 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-24 14:53:22 -0600 |
| commit | 057ca83db82f1d1d60fba09ecabed9904ea0f58b (patch) | |
| tree | 0bef1b99a1019d5f0c5cd3955a0c0684d2ca84fb /npc/_import.txt | |
| parent | 4992a988d984199ab577a7221eb3bb40029f15fd (diff) | |
| parent | 9467035b52c8cb3d4b3f92dc1b0c9a4b58f00f2e (diff) | |
| download | serverdata-057ca83db82f1d1d60fba09ecabed9904ea0f58b.tar.gz serverdata-057ca83db82f1d1d60fba09ecabed9904ea0f58b.tar.bz2 serverdata-057ca83db82f1d1d60fba09ecabed9904ea0f58b.tar.xz serverdata-057ca83db82f1d1d60fba09ecabed9904ea0f58b.zip | |
Merge remote branch 'wombat/master'
Conflicts:
npc/_import.txt
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
Diffstat (limited to 'npc/_import.txt')
| -rw-r--r-- | npc/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index 36ade972..3639d180 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -26,6 +26,7 @@ import: npc/011-4_Lake_cave/_import.txt import: npc/011-5/_import.txt import: npc/012-1_Woodland_Hills/_import.txt import: npc/012-3_Cave/_import.txt +import: npc/012-4_Cave/_import.txt import: npc/013-1_Woodland_hills/_import.txt import: npc/013-2_Magic_house/_import.txt import: npc/013-3_Cave/_import.txt |