diff options
| -rw-r--r-- | ChangeLog | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -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 |