cleanup

[platform/upstream/glib.git] / ChangeLog.pre-2-6

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6636d0f..41a9f78 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,31 @@
+2004-12-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Bump version
+
+       * === Released 2.6.0 ===
+       
+2004-12-15  Alexander Larsson  <alexl@redhat.com>
+
+       * glib/gconvert.c: (g_filename_display_basename):
+       Fix spelling
+       Add g_return_val_if_fail.
+       
+       * glib/glib.symbols:
+       Add g_filename_display_basename
+
+2004-12-15  Alexander Larsson  <alexl@redhat.com>
+
+       * glib/gconvert.[ch]:
+       Add g_filename_display_basename.
+
+2004-12-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * README.in: Updates
+
+       * NEWS: Updates.
+
+       * configure.in: Set version to 2.6.0
+
 2004-12-13  Tor Lillqvist  <tml@iki.fi>
 
        * NEWS: Update.