From 1260d294ed795011b5b73284e308a6a01d9eef9e Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 9 Apr 2011 09:09:35 +0000
Subject: * Merged changes from trunk [14742:14782/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/Changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'conf/Changelog.txt')

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 3a1121934..a890c1252 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2011/03/15
+	* Rev. 14744 Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135). [Ai4rei]
 2011/03/06
 	* Rev. 14732 Added search store info related settings. [Ai4rei]
 2011/02/23
-- 
cgit v1.2.3-60-g2f50