projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f86f5ca)
Correct small glitch introduced in ChangeLog by last commit.
authorPaul N. Hilfinger <hilfinger@adacore.com>
Tue, 9 Sep 2003 08:17:44 +0000 (08:17 +0000)
committerPaul N. Hilfinger <hilfinger@adacore.com>
Tue, 9 Sep 2003 08:17:44 +0000 (08:17 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9723adaf3697741d8067412d0374104debfb6313..d79901474e83b8efe4fd1ae7bf2e831dcdb5a06c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -421,7 +421,6 @@
        frame_unwind_register_unsigned instead of
        frame_unwind_unsigned_register.
 
->>>>>>> current-public.22/gdb/ChangeLog Mon, 08 Sep 2003 21:54:22 -0700 hilfingr (GdbPub/g/3_ChangeLog 1.15.1.2.1.1 644)
 2003-08-30  Mark Kettenis  <kettenis@gnu.org>
 
        * configure.in: Search for gethostbyname in libnsl.