summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-10-24 20:14:11 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-10-24 20:14:11 (GMT)
commitac923e955b3295407b5943859bd2a3b9989c17f3 (patch)
treee7e53df7c4f5fbeaee3107eba625394173422906
parent3da1bdd7794af6f2179dc7a61d3358fd33578d2f (diff)
parent11f06cc22a17048c30d82f66c468b484122de1e5 (diff)
downloadtk-ac923e955b3295407b5943859bd2a3b9989c17f3.zip
tk-ac923e955b3295407b5943859bd2a3b9989c17f3.tar.gz
tk-ac923e955b3295407b5943859bd2a3b9989c17f3.tar.bz2
merge release
-rw-r--r--README2
-rw-r--r--changes14
-rw-r--r--generic/tk.h4
-rw-r--r--library/tk.tcl2
-rwxr-xr-xunix/configure2
-rw-r--r--unix/configure.in2
-rw-r--r--unix/tk.spec2
-rwxr-xr-xwin/configure2
-rw-r--r--win/configure.in2
9 files changed, 23 insertions, 9 deletions
diff --git a/README b/README
index 9bb0e26..5551ebd 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
README: Tk
- This is the Tk 8.5.16 source distribution.
+ This is the Tk 8.5.17 source distribution.
http://sourceforge.net/projects/tcl/files/Tcl/
You can get any source release of Tk from the URL above.
diff --git a/changes b/changes
index 19aeb11..3d490d9 100644
--- a/changes
+++ b/changes
@@ -6951,3 +6951,17 @@ Many revisions to better support a Cygwin environment (nijtmans)
2014-08-01 (bug fix) OSX font config crash (rob@bitkeeper)
--- Released 8.5.16, August 25, 2014 --- http://core.tcl.tk/tk/ for details
+
+2014-08-27 (bug) Cocoa: Crash after [$button destroy] (walzer)
+
+2014-09-23 (bug) Cocoa: button and scroll display fixes (walzer)
+
+2014-09-24 (bug) Cocoa: improved drawing performance (walzer)
+
+2014-10-11 (bug)[9e487e] Phony button clicks from browsers to plugin (nijtmans)
+
+2014-10-11 (bug)[810c43] [text] elide changes advance epoch (vogel)
+
+2014-10-14 (bug)[fb35eb] fix PNG transparency appearance (walton,culler)
+
+--- Released 8.5.17, October 25, 2014 --- http://core.tcl.tk/tk/ for details
diff --git a/generic/tk.h b/generic/tk.h
index ac74807..186732b 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -59,10 +59,10 @@ extern "C" {
#define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 5
#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL 16
+#define TK_RELEASE_SERIAL 17
#define TK_VERSION "8.5"
-#define TK_PATCH_LEVEL "8.5.16"
+#define TK_PATCH_LEVEL "8.5.17"
/*
* A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index bb8cb2f..3dae5d4 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -15,7 +15,7 @@ package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp before
# Insist on running with compatible version of Tcl
package require Tcl 8.5.0
# Verify that we have Tk binary and script components from the same release
-package require -exact Tk 8.5.16
+package require -exact Tk 8.5.17
# Create a ::tk namespace
namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index 65adb1e..6a053d9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".16"
+TK_PATCH_LEVEL=".17"
VERSION=${TK_VERSION}
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
diff --git a/unix/configure.in b/unix/configure.in
index d40c0a1..7be1791 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".16"
+TK_PATCH_LEVEL=".17"
VERSION=${TK_VERSION}
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
diff --git a/unix/tk.spec b/unix/tk.spec
index 37d9107..32c0520 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -4,7 +4,7 @@
Name: tk
Summary: Tk graphical toolkit for the Tcl scripting language.
-Version: 8.5.16
+Version: 8.5.17
Release: 2
License: BSD
Group: Development/Languages
diff --git a/win/configure b/win/configure
index 136887f..7a009e7 100755
--- a/win/configure
+++ b/win/configure
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".16"
+TK_PATCH_LEVEL=".17"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index de877e0..78cc2e7 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".16"
+TK_PATCH_LEVEL=".17"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------