Sync with L2JServer Jan 24th 2015.

2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
--- a/trunk/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java
+++ b/trunk/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java
@@ -44,6 +44,7 @@ import com.l2jserver.gameserver.model.entity.Castle;
 */
 public class MerchantPriceConfigTable implements InstanceListManager
 {
+	// Zoey76: TODO: Implement using IXmlReader.
 	private static Logger LOGGER = Logger.getLogger(MerchantPriceConfigTable.class.getName());
 	
 	public static MerchantPriceConfigTable getInstance()