From 741230435bd23aa692f552649664b67a43a358c0 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 30 Jan 2011 00:25:44 +0000 Subject: * Merged changes from trunk [14636:14686/trunk]. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'npc/Changelog.txt') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 0d98c87d0..2af9a0613 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,10 @@ Date Added ====== +2011/01/16 + * Rev. 14676 Various fixes for scripts that are disabled by default. [Ai4rei] + - Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt + - Fixed name collision in THQS_Quests (custom) with 'Little Girl' in cities/lutie.txt + - Fixed outdated reference to npc_dynamic_shop sample (follow up to r14277). 2010/12/03 * Rev. 14555 Updated instances with more proper English, care of Resplendent. [L0ne_W0lf] 2010/12/02 -- cgit v1.2.3-70-g09d2