summaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2000-04-04 00:19:29 +0000
committerJim Ingham <jingham@apple.com>2000-04-04 00:19:29 +0000
commit50cf7be6a8cc022830d98f2b29bb64ed98a7400f (patch)
tree9349a08fcc881a72e1415df0e7cdecd17f6eb5ad /gdb
parentddb03bda6f805b1eae788ca79ffe5726bef6ffa9 (diff)
downloadgdb-50cf7be6a8cc022830d98f2b29bb64ed98a7400f.tar.gz
Oops, forgot to write out ChangeLog changes...
Diffstat (limited to 'gdb')
-rw-r--r--gdb/gdbtk/library/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/gdbtk/library/ChangeLog b/gdb/gdbtk/library/ChangeLog
index 7430bef1e51..a67e50545a6 100644
--- a/gdb/gdbtk/library/ChangeLog
+++ b/gdb/gdbtk/library/ChangeLog
@@ -21,7 +21,6 @@
(open): Make sure to abort any ongoing edit. This was causing problems
when someone tried to expand an structure while editing its pointer.
->>>>>>> 1.12
2000-03-28 James Ingham <jingham@leda.cygnus.com>
* managedwin.itb (ManagedWin::startup): Open the SrcWin, this does