summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-04-11 12:30:49 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-04-11 12:30:49 (GMT)
commit56f92f81db293cee4fa5443bf46fd07fa687d225 (patch)
tree71b6f64f171d2e619f4a62e18cc1309f695ce479
parentb6a16b508597ad78096256d1b1d4d12ab31e11c0 (diff)
downloadtk-56f92f81db293cee4fa5443bf46fd07fa687d225.zip
tk-56f92f81db293cee4fa5443bf46fd07fa687d225.tar.gz
tk-56f92f81db293cee4fa5443bf46fd07fa687d225.tar.bz2
Resolve ChangeLog conflict mistakenly committed.
-rw-r--r--ChangeLog11
1 files changed, 0 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index a347449..bf42b33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,3 @@
-<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<
-2011-03-29 Jan Nijtmans <nijtmans@users.sf.net>
-
- * generic/tk.decls: [Tcl Bug 3029891]: Functions that don't belong in
- * generic/tkDecls.h: the stub table. Tk part follow-up: Separate non-stub
- * generic/tkStubInit.c: entries in tkDecls.h, and hide away the obsolete
- stub entries using macros.
-
-2011-03-28 Donal K. Fellows <dkf@users.sf.net>
-======= original content above; conflict below =============
2011-04-06 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tkAppInit.c: Make symbols "main" and "Tcl_AppInit"
@@ -38,7 +28,6 @@
as a container.
2011-03-28 Donal K. Fellows <dkf@users.sf.net>
->>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>
* library/tk.tcl (::tk::FindAltKeyTarget): Make this handle the
traversal of the logical window manager hierarchy correctly. Based on