summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-07-18 21:39:18 (GMT)
committernijtmans <nijtmans>2010-07-18 21:39:18 (GMT)
commitf2b6f7a67098a6a6bc0ee9859b22bcfc35eee485 (patch)
tree54c9767f1d304bd2710f1e5ab2b00c81f44ffbcb /generic
parent801bb6b36320c0030ca52888b390e2f639c03ef3 (diff)
downloadtcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.zip
tcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.tar.gz
tcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.tar.bz2
[Bug 3031278] fixed merge problem in previous commit.
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h3
1 files changed, 1 insertions, 2 deletions
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;