Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata

Conflicts:
	db/const.txt
	npc/022-1_Tulimshar/_import.txt
	npc/_import.txt

1 files changed, 8 insertions, 0 deletions

diff --git a/npc/042-2/_mobs.txt b/npc/042-2/_mobs.txt
new file mode 100644
index 00000000..589e4711
--- /dev/null
+++ b/npc/042-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// 042-2 mobs
+
+
+
+042-2.gat,0,0,0	script	Mob042-2	-1,{
+	end;
+}