summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--generic/tcl.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6563951..67efc43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;