Bug 559110 – Do not include libintl.h after glibintl.h

[platform/upstream/glib.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 22a412e..782538a 100644 (file)
--- 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