Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/0ca62453ad7b
branches:  trunk
changeset: 448236:0ca62453ad7b
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Jan 27 05:14:45 2019 +0000

description:
Fix merge botch

diffstat:

 usr.bin/ldd/elf64/Makefile |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (11 lines):

diff -r df3776a8f67f -r 0ca62453ad7b usr.bin/ldd/elf64/Makefile
--- a/usr.bin/ldd/elf64/Makefile        Sun Jan 27 05:12:30 2019 +0000
+++ b/usr.bin/ldd/elf64/Makefile        Sun Jan 27 05:14:45 2019 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2019/01/27 02:08:51 pgoyette Exp $
-
-NOSANITIZER=           # defined
+#      $NetBSD: Makefile,v 1.11 2019/01/27 05:14:45 kre Exp $
 
 NOSANITIZER=           # defined
 



Home | Main Index | Thread Index | Old Index