summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2007-11-20 11:01:12 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2007-11-20 11:01:12 (GMT)
commitd6f5cbae63648ef8601d7f179bd8f321b4e819bb (patch)
tree16e1541ffe61032c861fbff9b613070460bf54b8
parentcab83627f204aa8bfe9ca5fcb7e6767b7a05cef2 (diff)
downloadtcl-d6f5cbae63648ef8601d7f179bd8f321b4e819bb.zip
tcl-d6f5cbae63648ef8601d7f179bd8f321b4e819bb.tar.gz
tcl-d6f5cbae63648ef8601d7f179bd8f321b4e819bb.tar.bz2
Minor fix
-rw-r--r--ChangeLog15
1 files changed, 0 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index ef90fda..85abf53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -189,19 +189,11 @@
* generic/tclCompCmds.c, generic/tclCompile.c, generic/tclCompile.h:
* generic/tclExecute.c, generic/tclInt.decls, generic/tclIntDecls.h:
-<<<<<<< ChangeLog
* generic/tclRegexp.c, generic/tclRegexp.h: Add INST_REGEXP and fully
* generic/tclStubInit.c, generic/tclUtil.c: compiled [regexp] for the
* tests/regexpComp.test: [Bug 1830166] simple cases. Also added
TclReToGlob function to convert RE to glob patterns and use these in
the possible cases.
-=======
- * generic/tclRegexp.c, generic/tclRegexp.h: Add INST_REGEXP and
- * generic/tclStubInit.c, generic/tclUtil.c: fully compiled [regexp]
- * tests/regexpComp.test: for the simple cases.
- Also added TclReToGlob function to convert RE to glob patterns and use
- these in the possible cases. [Bug 1830166]
->>>>>>> 1.3796
2007-11-11 Miguel Sofer <msofer@users.sf.net>
@@ -213,17 +205,10 @@
* generic/tclCmdAH.c: TclGetIntForIndexM & TclListObjLength,
* generic/tclCmdIL.c: modified TclListObjGetElements.
* generic/tclCmdMZ.c:
-<<<<<<< ChangeLog
- * generic/tclCompCmds.c: The TclGetInt* macros are only a shortcut
- * generic/tclCompExpr.c: on platforms where 'long' is 'int'; it may
- * generic/tclCompile.c: be worthwhile to extend their
- * generic/tclDictObj.c: functionality also to other cases.
-=======
* generic/tclCompCmds.c: The TclGetInt* macros are only a
* generic/tclCompExpr.c: shortcut on platforms where 'long' is
* generic/tclCompile.c: 'int'; it may be worthwhile to extend
* generic/tclDictObj.c: their functionality to other cases.
->>>>>>> 1.3796
* generic/tclExecute.c:
* generic/tclGet.c: As this patch touches many files it has
* generic/tclIO.c: been recorded as [Patch 1830038] in