aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2001-10-01 23:00:29 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2001-10-01 23:00:29 +0000
commit0878b3a9b13e602bf1a31682dd465c0a0debb282 (patch)
tree2c0272f81bd48e744316a4edbcdb874a08094f92
parent79a79ad9b825e5dd5151ed130147677fda6fc644 (diff)
downloadsrc-0878b3a9b13e602bf1a31682dd465c0a0debb282.tar.gz
src-0878b3a9b13e602bf1a31682dd465c0a0debb282.zip
Fix ID's after a total boch CVS merge due to multiple people making
commits to these files. As I sing to CVS: Have I told you lately that I hate your guts? Have I told you all SCM's are above you? You fill my heart with pain, take away all my merging joy, grow my troubles that's what you do."
Notes
Notes: svn path=/head/; revision=84334
-rw-r--r--lib/libedit/chared.c2
-rw-r--r--lib/libedit/common.c2
-rw-r--r--lib/libedit/emacs.c2
-rw-r--r--lib/libedit/hist.c2
-rw-r--r--lib/libedit/history.c2
-rw-r--r--lib/libedit/key.c2
-rw-r--r--lib/libedit/map.c2
-rw-r--r--lib/libedit/parse.c2
-rw-r--r--lib/libedit/prompt.c2
-rw-r--r--lib/libedit/refresh.c2
-rw-r--r--lib/libedit/search.c2
-rw-r--r--lib/libedit/tokenizer.c2
-rw-r--r--lib/libedit/vi.c2
13 files changed, 0 insertions, 26 deletions
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index 5d5e6ca3808c..8efb35d3be47 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -36,8 +36,6 @@
* $NetBSD: chared.c,v 1.13 2001/04/13 01:04:19 lukem Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 386579caa89b..f2d02e30ba98 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -36,8 +36,6 @@
* $NetBSD: common.c,v 1.9 2000/09/04 22:06:29 lukem Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index afc141bbc715..2e82f13c01a6 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -36,8 +36,6 @@
* $NetBSD: emacs.c,v 1.8 2000/09/04 22:06:29 lukem Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
index ac80b866299b..f4bbf5dee2e3 100644
--- a/lib/libedit/hist.c
+++ b/lib/libedit/hist.c
@@ -36,8 +36,6 @@
* $NetBSD: hist.c,v 1.8 2001/01/10 07:45:41 jdolecek Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index f0eff88d5e32..c88979e4cff4 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -36,8 +36,6 @@
* $NetBSD: history.c,v 1.16 2000/09/04 22:06:30 lukem Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index dcb0b6668571..625148619457 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -36,8 +36,6 @@
* $NetBSD: key.c,v 1.11 2001/01/23 15:55:30 jdolecek Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
index 592631cc949f..67c61cf56500 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -36,8 +36,6 @@
* $NetBSD: map.c,v 1.13 2001/01/04 15:56:32 christos Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
index e96743fbe3a2..f83dc94c6e38 100644
--- a/lib/libedit/parse.c
+++ b/lib/libedit/parse.c
@@ -36,8 +36,6 @@
* $NetBSD: parse.c,v 1.13 2000/09/04 22:06:31 lukem Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 56401d662c9b..10ba70b2baca 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -36,8 +36,6 @@
* $NetBSD: prompt.c,v 1.7 2000/09/04 22:06:31 lukem Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index 3be9e2cceffd..08f1336e203a 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -36,8 +36,6 @@
* $NetBSD: refresh.c,v 1.16 2001/01/10 07:45:42 jdolecek Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 4d832d71f2bc..96a0206bd285 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -36,8 +36,6 @@
* $NetBSD: search.c,v 1.10 2001/01/04 15:56:32 christos Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 2969f53c3cda..8c7ae8e36ca4 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -36,8 +36,6 @@
* $NetBSD: tokenizer.c,v 1.6 2000/09/04 22:06:33 lukem Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)tokenizer.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index c58c5b10cc6e..34f781c22b3e 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -36,8 +36,6 @@
* $NetBSD: vi.c,v 1.7 1999/07/02 15:21:28 simonb Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if !defined(lint) && !defined(SCCSID)
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */