Source-Changes-HG archive

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

[src/trunk]: src/bin/ps oops, fix merge botch in previous..



details:   https://anonhg.NetBSD.org/src/rev/717171ac7834
branches:  trunk
changeset: 472582:717171ac7834
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon May 03 00:20:07 1999 +0000

description:
oops, fix merge botch in previous..

diffstat:

 bin/ps/ps.h |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 06c1a4eca68e -r 717171ac7834 bin/ps/ps.h
--- a/bin/ps/ps.h       Mon May 03 00:17:30 1999 +0000
+++ b/bin/ps/ps.h       Mon May 03 00:20:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ps.h,v 1.14 1999/05/03 00:17:31 mrg Exp $      */
+/*     $NetBSD: ps.h,v 1.15 1999/05/03 00:20:07 mrg Exp $      */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,6 @@
 #define        UNLIMITED       0       /* unlimited terminal width */
 enum type {
        CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, KPTR24,
-       CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR,
        INT32, UINT32, SIGLIST
 };
 



Home | Main Index | Thread Index | Old Index