diff options
| author | nijtmans <nijtmans> | 2010-07-18 21:39:18 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-07-18 21:39:18 (GMT) |
| commit | f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485 (patch) | |
| tree | 54c9767f1d304bd2710f1e5ab2b00c81f44ffbcb | |
| parent | 801bb6b36320c0030ca52888b390e2f639c03ef3 (diff) | |
| download | tcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.zip tcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.tar.gz tcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.tar.bz2 | |
[Bug 3031278] fixed merge problem in previous commit.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tcl.h | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2010-07-18 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tcl.h [Bug 3031278] fixed merge problem in previous commit. + 2010-07-17 Jan Nijtmans <nijtmans@users.sf.net> * generic/tcl.h [Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6 diff --git a/generic/tcl.h b/generic/tcl.h index 7734175..066213d 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.153.2.38 2010/07/17 07:43:46 nijtmans Exp $ + * RCS: @(#) $Id: tcl.h,v 1.153.2.39 2010/07/18 21:39:19 nijtmans Exp $ */ #ifndef _TCL @@ -946,7 +946,6 @@ typedef struct Tcl_CallFrame { VOID *dummy8; int dummy9; VOID *dummy10; - VOID *dummy10; VOID *dummy11; VOID *dummy12; VOID *dummy13; |