X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ChangeLog.pre-2-6;h=41a9f781b79a023e4d22d71f4eb786b15e28a252;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=6636d0f9c6835f54cb3b16fbddeeb63620034f5c;hpb=b17c8523d9ff657f0525ad42853a009f1a7aa8e8;p=platform%2Fupstream%2Fglib.git

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6636d0f..41a9f78 100644
--- 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.