merge updates from HEAD

2 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 34fd1bc..1761586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-01  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.5.1 TAGGED FOR RELEASE ***
+
+	* changes:	Updates for 8.5.1 release.
+
 2008-02-01  Reinhard Max  <max@suse.de>
 
 	* generic/tkImgGIF.c: Fixed a buffer overflow (CVE-2006-4484).
@@ -49,7 +55,7 @@
 	GetTkFontMetrics(). Removed write-only struct UnixFtFont member
 	'drawable'. Removed unneeded double-pointer indirections. Ensure that
 	TkFontAttributes.family member is a Tk_Uid, as specified. Use
-	FcTypeDouble for XFT_SIZE attribute. Finally: fix [Bug 835848]
+	FcTypeDouble for XFT_SIZE attribute. Finally: fix [Bug 1835848]
 
 2008-01-25  Don Porter  <dgp@users.sourceforge.net>
 
diff --git a/changes b/changes
index 42e4aca..40b28ed 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
 released on March 13, 1991.  Changes that aren't backward compatible
 are marked specially.
 
-RCS: @(#) $Id: changes,v 1.107.2.7 2008/01/25 21:41:46 dgp Exp $
+RCS: @(#) $Id: changes,v 1.107.2.8 2008/02/01 22:14:18 dgp Exp $
 
 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
 the interpreter when the main window is deleted (otherwise there will
@@ -6474,4 +6474,12 @@ Several documentation and release notes improvements
 
 2008-01-08 (bug fix)[1867122] [labelframe -style] crash (english,rib)
 
+2008-01-27 (bug fix)[1835848] size value returned by [font actual] (english)
+
+2008-01-27 (bug fix)[1878298] [notebook] redraws on tab visibility (english)
+
+2008-01-31 (bug fix)[1881892] messagebox default title (hobbs)
+
+2008-02-01 (bug fix)[CVE-2006-4484] buffer overflow in GIF format (max)
+
 --- Released 8.5.1, February 1, 2008 --- See ChangeLog for details ---