From ff5bc2feb71adc7c52f0eef7ca96aa3263a4ee51 Mon Sep 17 00:00:00 2001
From: stanton <stanton>
Date: Wed, 26 May 1999 02:39:14 +0000
Subject: Merged changes from 1-3-b2 branch into mainline.

---
 changes           | 15 +++++++++++++--
 unix/configure.in |  5 +++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/changes b/changes
index 6cea620..9be87ea 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.33 1999/04/30 22:49:54 stanton Exp $
+RCS: @(#) $Id: changes,v 1.34 1999/05/26 02:39:14 stanton 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
@@ -4589,9 +4589,20 @@ headers. (redman)
 4/22/99 (bug fix) Set the -translation and -encoding options to binary
 for image files. (redman)
 
-4/27 (bug fix) Changed to avoid the need for forward declarations in
+4/27/99 (bug fix) Changed to avoid the need for forward declarations in
 stub initializers.  Added extern "C" blocks around stub table pointer
 declarations so the stubs can be used from C++ code. (stanton)
 
 --------------- Released 8.1 final, April 29, 1999 ----------------------
 
+5/7/99 (bug fix) Fixed bug wheretk_popup fails when called too
+quickly. [Bug: 2009] (stanton)
+
+5/18/99 (bug fix) Fixed clipboard code so it handles Unicode data
+properly on Windows NT and 95. [Bug: 1791] (stanton)
+
+5/19/99 (bug fix) Add extern "C" block around entire header file for
+C++ compilers to fix linkage issues.  Submitted by Don Porter and Paul
+Duffin. (redman)
+
+--------------- Released 8.1.1, May 25, 1999 ----------------------
diff --git a/unix/configure.in b/unix/configure.in
index a3055c9..74a8eed 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,12 +3,13 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.33 1999/04/30 23:40:45 stanton Exp $
+# RCS: @(#) $Id: configure.in,v 1.34 1999/05/26 02:39:14 stanton Exp $
 
 TK_VERSION=8.1
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=1
-TK_PATCH_LEVEL=1
+# The patch level should be blank for patch releases (i.e. not alpha/beta)
+TK_PATCH_LEVEL=
 VERSION=${TK_VERSION}
 
 if test "${prefix}" = "NONE"; then
-- 
cgit v0.12