From 7157ce9ba626dd87fd63937d13b0a0ac6368afb9 Mon Sep 17 00:00:00 2001
From: eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 24 Dec 2011 15:17:49 +0000
Subject: * Merged changes up to eAthena 15041.

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

(limited to 'Changelog-Trunk.txt')

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0b826b771..67780ced1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -2,6 +2,9 @@ Date (YYYY-MM-DD)
 	Added
 
 2011-12-24
+	* Added constants for log item filter constants. [Ai4rei]
+	- Removed argument in should_log_item, which always took log_config.filter as value.
+	- Fixed missed update in struct Log_Config, enum log_what -> e_log_pick_type (since r15040).
 	* Updates to map-server's log system. [Ai4rei]
 	- Moved all logs configuration checks from caller functions into respective log functions, and replaced string log types with an enumeration.
 2011-12-22
-- 
cgit v1.2.3-60-g2f50