diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-04 14:01:45 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-04 14:01:45 (GMT) |
commit | c2846c0f5c00bb7b9a7952ea378016aa350936a6 (patch) | |
tree | c29aee6003b527d00e6cd4060cba4a82587bc2c1 /library | |
parent | b74f59a5b4f94a8fde1d58fdd6aff13d251d8a7b (diff) | |
parent | a15279ffd11639e3eee06f618dd684eab635e334 (diff) | |
download | tcl-c2846c0f5c00bb7b9a7952ea378016aa350936a6.zip tcl-c2846c0f5c00bb7b9a7952ea378016aa350936a6.tar.gz tcl-c2846c0f5c00bb7b9a7952ea378016aa350936a6.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.tcl | 2 | ||||
-rw-r--r-- | library/msgcat/pkgIndex.tcl | 4 |
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]] |