diff options
| author | dgp <dgp@noemail.net> | 2011-04-11 12:30:49 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2011-04-11 12:30:49 (GMT) |
| commit | 828213f83ee158cb7b9b9c2bcc7e07aed560353b (patch) | |
| tree | 71b6f64f171d2e619f4a62e18cc1309f695ce479 | |
| parent | d2de6206cf05b9dbbd69f9a9ff0bd3473883478d (diff) | |
| download | tk-828213f83ee158cb7b9b9c2bcc7e07aed560353b.zip tk-828213f83ee158cb7b9b9c2bcc7e07aed560353b.tar.gz tk-828213f83ee158cb7b9b9c2bcc7e07aed560353b.tar.bz2 | |
Resolve ChangeLog conflict mistakenly committed.
FossilOrigin-Name: 9df6b36eecba80f3bda7a2cb01316e53028f7ee5
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -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 |