X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=ChangeLog.pre-2-6;h=7f1551ff776e45f3c1bc2912b4854691785f1130;hb=dab457fbc689c0c1fc36a6ab07757bc7f5f6ffa3;hp=61399d19f80eeb313ad28af1252b99ff7750b32c;hpb=860228fa3623c49a7bd262951fdb7ed34f3d1800;p=~andy%2Fgtk

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 61399d19f..7f1551ff7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,19 @@
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Bump version
+
+	* === Released 2.6.0 ===
+
+	* gtk/gtkmenuitem.c: Add a forgotten cast.  (Morten Welinder) 
+
+	* gtk/gtkfilechooserbutton.c: Add another forgotten include. (Morten
+	Welinder)
+
+2004-12-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
+	if they are blocked.
+
 	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
 	crash if enable_search is FALSE.  (#161267, Jorn Baayen)