summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-09-04 14:01:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-09-04 14:01:45 (GMT)
commitedb7af10d93df44cc25e9dce384c61669ce73dc8 (patch)
treec29aee6003b527d00e6cd4060cba4a82587bc2c1 /library
parentdba280d1b84eae2c164b1c0991e1b0795e290b8e (diff)
parent0477cb15f93e08f2ef2651122ec92163cbf621c0 (diff)
downloadtcl-edb7af10d93df44cc25e9dce384c61669ce73dc8.zip
tcl-edb7af10d93df44cc25e9dce384c61669ce73dc8.tar.gz
tcl-edb7af10d93df44cc25e9dce384c61669ce73dc8.tar.bz2
Merge core-8-6-branch to trunk, especially the 1.6.0 -> 1.6.1 renumbering from msgcat
Diffstat (limited to 'library')
-rw-r--r--library/msgcat/msgcat.tcl2
-rw-r--r--library/msgcat/pkgIndex.tcl4
2 files changed, 3 insertions, 3 deletions
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 928474d..646bc17 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -14,7 +14,7 @@
package require Tcl 8.5-
# When the version number changes, be sure to update the pkgIndex.tcl file,
# and the installation directory in the Makefiles.
-package provide msgcat 1.6.0
+package provide msgcat 1.6.1
namespace eval msgcat {
namespace export mc mcexists mcload mclocale mcmax mcmset mcpreferences mcset\
diff --git a/library/msgcat/pkgIndex.tcl b/library/msgcat/pkgIndex.tcl
index 7399c92..72c5dc0 100644
--- a/library/msgcat/pkgIndex.tcl
+++ b/library/msgcat/pkgIndex.tcl
@@ -1,2 +1,2 @@
-if {![package vsatisfies [package provide Tcl] 8.5]} {return}
-package ifneeded msgcat 1.6.0 [list source [file join $dir msgcat.tcl]]
+if {![package vsatisfies [package provide Tcl] 8.5-]} {return}
+package ifneeded msgcat 1.6.1 [list source [file join $dir msgcat.tcl]]