summaryrefslogtreecommitdiff
path: root/usr.bin/ipcs
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-04 16:24:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-04 16:24:46 +0000
commit4086acbca5d46c0885abb7a50e8ad66bbc5e7aa7 (patch)
tree4807d88e76fbdaf81f8e42db88195f26ec76b526 /usr.bin/ipcs
parent286a8dac8c0fe0f382934c3de9b56d8f68c8548a (diff)
term 3 & 4 from tholo after permission
Diffstat (limited to 'usr.bin/ipcs')
-rw-r--r--usr.bin/ipcs/ipcs.14
-rw-r--r--usr.bin/ipcs/ipcs.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 2f5adb0f879..686364c4e0a 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipcs.1,v 1.14 2001/11/09 00:56:24 miod Exp $
+.\" $OpenBSD: ipcs.1,v 1.15 2003/06/04 16:24:45 deraadt Exp $
.\"
.\" Copyright (c) 1994 SigmaSoft, Th. Lockert
.\" All rights reserved.
@@ -11,8 +11,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\" derived from this software without specific prior written permission
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 2c7c6494b61..803d1cf9629 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipcs.c,v 1.19 2002/12/17 23:11:32 millert Exp $ */
+/* $OpenBSD: ipcs.c,v 1.20 2003/06/04 16:24:45 deraadt Exp $ */
/* $NetBSD: ipcs.c,v 1.25 2000/06/16 03:58:20 simonb Exp $ */
/*-
@@ -49,8 +49,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY