Merge branch 'master' of git@gitorious.org:tmw-eathena-data/map-renaming

Conflicts:

	npc/_import.txt

1 files changed, 32 insertions, 32 deletions

diff --git a/npc/_import.txt b/npc/_import.txt
index bb22ec47..1812076a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,41 +1,41 @@
-import: npc/020-3_Ice_cave/_import.txt
-import: npc/018-1_Woodland_mining_camp/_import.txt
-import: npc/012-3_Cave/_import.txt
-import: npc/010-2_Dimond's_Cove/_import.txt
-import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
-import: npc/020-2/_import.txt
-import: npc/018-3_Cave/_import.txt
-import: npc/008-1_Hurnscald_outskirts/_import.txt
-import: npc/006-3_Desert_mountain_caves/_import.txt
-import: npc/019-1_Snow_field/_import.txt
+import: npc/001-1_Tulimshar/_import.txt
+import: npc/001-2_Tulimshar/_import.txt
 import: npc/001-3_Tulimshar_arena/_import.txt
-import: npc/020-1/_import.txt
+import: npc/002-1_Sandstorm/_import.txt
 import: npc/002-2/_import.txt
-import: npc/007-1_Woodland/_import.txt
-import: npc/013-1_Woodland_hills/_import.txt
-import: npc/016-1_Woodland/_import.txt
-import: npc/010-1_Woodland/_import.txt
-import: npc/014-1_Woodland/_import.txt
+import: npc/002-3_Desert_mines/_import.txt
+import: npc/002-4_Desert_mines/_import.txt
+import: npc/003-1_Beach/_import.txt
 import: npc/004-1_Beach/_import.txt
 import: npc/005-1_Snake_desert/_import.txt
-import: npc/002-1_Sandstorm/_import.txt
-import: npc/018-2_Woodland_minning_camp/_import.txt
-import: npc/011-4_Lake_cave/_import.txt
-import: npc/013-2_Magic_house/_import.txt
-import: npc/003-1_Beach/_import.txt
-import: npc/015-1_Woodland/_import.txt
 import: npc/005-3_Snake_pit/_import.txt
-import: npc/014-3_Cave/_import.txt
-import: npc/011-3_Hermit's_cave/_import.txt
-import: npc/017-1_Woodland_hills/_import.txt
-import: npc/001-2_Tulimshar/_import.txt
+import: npc/006-1_Desert_mountains/_import.txt
+import: npc/006-3_Desert_mountain_caves/_import.txt
+import: npc/007-1_Woodland/_import.txt
+import: npc/008-1_Hurnscald_outskirts/_import.txt
+import: npc/009-1_Hurnscald/_import.txt
 import: npc/009-2_Hurnscald/_import.txt
+import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
+import: npc/010-1_Woodland/_import.txt
+import: npc/010-2_Dimond's_Cove/_import.txt
+import: npc/011-1_Woodland/_import.txt
+import: npc/011-3_Hermit's_cave/_import.txt
+import: npc/011-4_Lake_cave/_import.txt
 import: npc/012-1_Woodland_Hills/_import.txt
-import: npc/001-1_Tulimshar/_import.txt
-import: npc/002-4_Desert_mines/_import.txt
+import: npc/012-3_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
-import: npc/009-1_Hurnscald/_import.txt
-import: npc/006-1_Desert_mountains/_import.txt
+import: npc/014-1_Woodland/_import.txt
+import: npc/014-3_Cave/_import.txt
+import: npc/015-1_Woodland/_import.txt
+import: npc/016-1_Woodland/_import.txt
+import: npc/017-1_Woodland_hills/_import.txt
+import: npc/018-1_Woodland_mining_camp/_import.txt
+import: npc/018-2_Woodland_minning_camp/_import.txt
+import: npc/018-3_Cave/_import.txt
+import: npc/019-1_Snow_field/_import.txt
+import: npc/020-1/_import.txt
+import: npc/020-2/_import.txt
+import: npc/020-3_Ice_cave/_import.txt
 import: npc/020-4_Ice_cave/_import.txt
-import: npc/002-3_Desert_mines/_import.txt
-import: npc/011-1_Woodland/_import.txt