Posted to tcl by dgp at Tue Mar 01 18:42:06 GMT 2011view raw
- $ diff -u changes-original changes
- --- changes-original 2011-03-01 13:37:28.055000000 -0500
- +++ changes 2011-03-01 13:37:28.119000000 -0500
- @@ -1,6 +1,9 @@
- Recent user-visible changes to Tcl:
- +<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<
- RCS: @(#) $Id: changes,v 1.136.2.27 2010/09/08 17:38:32 dgp Exp $
- +======= original content above; conflict below =============
- +>>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>
- 1. No more [command1] [command2] construct for grouping multiple
- commands on a single command line.
- @@ -5858,7 +5861,7 @@
- 2003-07-16 (bug fix)[756791] corrected assumption that Tcl_Free == free
- -2003-07-16 (feature enhancement) -DTCL_UTF_MAX=6 compile option forces
- +2003-07-16 (feature enhancement) -DTCL_UTF_MAX=6 compile option forces
- internal UCS-4 representation of Unicode (default is recommended UCS-2).
- 2003-07-16 (bug fix)[767578] 64-bit corrections in thread notifier.
- @@ -6099,7 +6102,7 @@
- 2004-05-13 (new feature)[TIP 142] [interp limit] (fellows)
- -2004-05-14 (bug fix)[940278,922848] [clock] notices $::env(TZ) changes,
- +2004-05-14 (bug fix)[940278,922848] [clock] notices $::env(TZ) changes,
- gmt works on all platforms. (kenny, welton, glessner)
- 2004-05-16 (feature rewrite) bytecode execution of {expand} changed