summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2010-04-29 15:08:38 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2010-04-29 15:08:38 (GMT)
commit2a90da0aa437df7266bd2cb345c248969a8a8f6b (patch)
treeb3aed32484344005d466bd49136268d9ca186a03
parentb84b65f49a83dd2409278f59c82fc6c79d466819 (diff)
downloadtcl-2a90da0aa437df7266bd2cb345c248969a8a8f6b.zip
tcl-2a90da0aa437df7266bd2cb345c248969a8a8f6b.tar.gz
tcl-2a90da0aa437df7266bd2cb345c248969a8a8f6b.tar.bz2
typo
-rw-r--r--ChangeLog5
1 files changed, 0 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 74f6a87..fff0cff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,13 +81,8 @@
2010-04-25 Miguel Sofer <msofer@users.sf.net>
-<<<<<<< ChangeLog
- * generic/tclBasic.c: Add unsupported [yieldm] command.
- * generic/tclInt.h:
-=======
* generic/tclBasic.c: Add unsupported [yieldm] command. Credit
* generic/tclInt.h: Lars Hellstrom for the basic idea.
->>>>>>> 1.5083
2010-04-24 Miguel Sofer <msofer@users.sf.net>