From b4e88f2f02951591d71b9c89dd028a2c5d4ca587 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:49:21 +0000
Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files
 that had     a changed license. There was only one change which happened to
 be from     me (Egbert Eich).

---
 XEKeybCtrl.c | 2 +-
 XEKeybCtrl.h | 2 +-
 chparse.c    | 2 +-
 chparse.h    | 2 +-
 xtrap.man    | 2 +-
 xtrapchar.c  | 2 +-
 xtrapin.c    | 2 +-
 xtrapinfo.c  | 2 +-
 xtrapout.c   | 2 +-
 xtrapproto.c | 2 +-
 xtrapreset.c | 2 +-
 xtrapstats.c | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/XEKeybCtrl.c b/XEKeybCtrl.c
index 1c851b2..3000783 100644
--- a/XEKeybCtrl.c
+++ b/XEKeybCtrl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/XEKeybCtrl.c,v 1.1 2001/11/02 23:29:34 dawes Exp $ */
+/* $XFree86$ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991, 1992 by Digital Equipment Corp., 
 Maynard, MA
diff --git a/XEKeybCtrl.h b/XEKeybCtrl.h
index d0362c4..aa1b14a 100644
--- a/XEKeybCtrl.h
+++ b/XEKeybCtrl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/XEKeybCtrl.h,v 1.1 2001/11/02 23:29:34 dawes Exp $ */
+/* $XFree86$ */
 
 extern int XEEnableCtrlKeys(void(*rtn)(int));
 extern int XEEnableCtrlC(void (*rtn)(int));
diff --git a/chparse.c b/chparse.c
index 820f308..19ef746 100644
--- a/chparse.c
+++ b/chparse.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/chparse.c,v 1.4 2003/05/27 22:27:13 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/chparse.c,v 1.3tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 
diff --git a/chparse.h b/chparse.h
index 933846d..588df21 100644
--- a/chparse.h
+++ b/chparse.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/chparse.h,v 1.1 2001/11/02 23:29:34 dawes Exp $ */
+/* $XFree86$ */
 
 extern int chparse(int max_delay, int rest_delay, int *state, int *private,
 		   int param[], int *nparam, int inter[], int *ninter,
diff --git a/xtrap.man b/xtrap.man
index d1a4938..f77e2ae 100644
--- a/xtrap.man
+++ b/xtrap.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/xtrap/xtrap.man,v 1.3 2003/05/29 21:48:13 herrb Exp $
+.\" $XFree86: xc/programs/xtrap/xtrap.man,v 1.2 2001/11/03 18:51:04 dawes Exp $
 .TH xtrap 1
 .SH NAME
 xtrapreset, xtrapinfo, xtrapstats, xtrapout, xtrapin, xtrapchar, xtrapproto  
diff --git a/xtrapchar.c b/xtrapchar.c
index 3f632d6..195b1dc 100644
--- a/xtrapchar.c
+++ b/xtrapchar.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapchar.c,v 1.3 2001/12/12 00:43:50 dawes Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapchar.c,v 1.2 2001/11/19 15:33:41 tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
diff --git a/xtrapin.c b/xtrapin.c
index f70fb85..092d493 100644
--- a/xtrapin.c
+++ b/xtrapin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapin.c,v 1.3 2003/05/27 22:27:13 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapin.c,v 1.2tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
diff --git a/xtrapinfo.c b/xtrapinfo.c
index 0337e83..fa96389 100644
--- a/xtrapinfo.c
+++ b/xtrapinfo.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapinfo.c,v 1.2 2002/09/18 17:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapinfo.c,v 1.1tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
diff --git a/xtrapout.c b/xtrapout.c
index f784a99..d99cf93 100644
--- a/xtrapout.c
+++ b/xtrapout.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapout.c,v 1.2 2001/12/12 00:43:50 dawes Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapout.c,v 1.1 2001/11/02 23:29:34 dawes Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
diff --git a/xtrapproto.c b/xtrapproto.c
index 1fed9fa..d322afa 100644
--- a/xtrapproto.c
+++ b/xtrapproto.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapproto.c,v 1.4 2003/05/27 22:27:13 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapproto.c,v 1.3tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
diff --git a/xtrapreset.c b/xtrapreset.c
index 1eda765..11a919a 100644
--- a/xtrapreset.c
+++ b/xtrapreset.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapreset.c,v 1.2 2002/09/18 17:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapreset.c,v 1.1tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
diff --git a/xtrapstats.c b/xtrapstats.c
index 5dc0def..171c9ac 100644
--- a/xtrapstats.c
+++ b/xtrapstats.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapstats.c,v 1.2 2002/09/18 17:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapstats.c,v 1.1tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
-- 
cgit v1.2.3