summaryrefslogtreecommitdiffstats
path: root/generic/tk.h
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-04-03 13:24:39 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-04-03 13:24:39 (GMT)
commit6c3188baaf39b816f6804c3d57cb70368384cab0 (patch)
tree0216a9e014a1edd19fff7c344e2256d3528f10c0 /generic/tk.h
parentf2d23fc648c74066e46c078fb8d4e795d9fcaf41 (diff)
downloadtk-6c3188baaf39b816f6804c3d57cb70368384cab0.zip
tk-6c3188baaf39b816f6804c3d57cb70368384cab0.tar.gz
tk-6c3188baaf39b816f6804c3d57cb70368384cab0.tar.bz2
merge release to 8.5; revert features not included in release
Diffstat (limited to 'generic/tk.h')
-rw-r--r--generic/tk.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tk.h b/generic/tk.h
index 7c686a3..ca66ceb 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 13
+#define TK_RELEASE_SERIAL 14
#define TK_VERSION "8.5"
-#define TK_PATCH_LEVEL "8.5.13"
+#define TK_PATCH_LEVEL "8.5.14"
/*
* A special definition used to allow this header file to be included from