Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/ldd Fix merge botch



details:   https://anonhg.NetBSD.org/src/rev/df6af0401b3e
branches:  trunk
changeset: 447883:df6af0401b3e
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Jan 27 05:16:55 2019 +0000

description:
Fix merge botch

diffstat:

 usr.bin/ldd/build/Makefile |  4 +---
 usr.bin/ldd/elf32/Makefile |  4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r 942e2cb4011a -r df6af0401b3e usr.bin/ldd/build/Makefile
--- a/usr.bin/ldd/build/Makefile        Sun Jan 27 05:16:10 2019 +0000
+++ b/usr.bin/ldd/build/Makefile        Sun Jan 27 05:16:55 2019 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/01/27 02:08:50 pgoyette Exp $
-
-NOSANITIZER=           # defined
+#      $NetBSD: Makefile,v 1.5 2019/01/27 05:17:48 kre Exp $
 
 NOSANITIZER=           # defined
 
diff -r 942e2cb4011a -r df6af0401b3e usr.bin/ldd/elf32/Makefile
--- a/usr.bin/ldd/elf32/Makefile        Sun Jan 27 05:16:10 2019 +0000
+++ b/usr.bin/ldd/elf32/Makefile        Sun Jan 27 05:16:55 2019 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2019/01/27 02:08:50 pgoyette Exp $
-
-NOSANITIZER=           # defined
+#      $NetBSD: Makefile,v 1.12 2019/01/27 05:16:55 kre Exp $
 
 NOSANITIZER=           # defined
 



Home | Main Index | Thread Index | Old Index