X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ChangeLog;h=782538a6967f5d6f286ca590619900a755f5d1b4;hb=6417df2a917a48073f52d69f765a02eba57fc6cb;hp=22a412e7b47c2b28287b3e13fd4ff42d1d0dae7c;hpb=0b715510de5d8c5f293216d29a8dd653a08b2a18;p=platform%2Fupstream%2Fglib.git

diff --git a/ChangeLog b/ChangeLog
index 22a412e..782538a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-11-28  Matthias Clasen  <mclasen@redhat.com>
 
+	Bug 559110 – Do not include libintl.h after glibintl.h
+
+	* glib/glibintl.h: Define bind_textdomain_codeset in the DISABLE_NLS
+	branch. Patch by Peter Kjellerstedt.
+
+	* glib/gutil.c: Don't include libintl.h directly.
+
+2008-11-28  Matthias Clasen  <mclasen@redhat.com>
+
 	Bug 562378 – callback return value not respected for callback option
 	with no arg