18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

6 files changed, 6 insertions, 6 deletions

diff --git a/exec.c b/exec.c
index cc105a8..4c77e35 100644
--- a/exec.c
+++ b/exec.c
@@ -57,7 +57,7 @@ from The Open Group.
  * Author:  Jim Fulton, MIT X Consortium; derived from parts of the
  * original xmodmap, written by David Rosenthal, of Sun Microsystems.
  */
-/* $XFree86: xc/programs/xmodmap/exec.c,v 1.6 2003/12/02 13:13:57 pascal Exp $ */
+/* $XFree86: xc/programs/xmodmap/exec.c,v 1.5 2001/12/14 20:02:13 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
diff --git a/handle.c b/handle.c
index 9d91d55..09f40cb 100644
--- a/handle.c
+++ b/handle.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmodmap/handle.c,v 3.7 2001/12/14 20:02:13 dawes Exp $ */
+/* $XFree86: xc/programs/xmodmap/handle.c,v 3.6 2001/07/25 15:05:27 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
diff --git a/wq.h b/wq.h
index 5caa8a1..3aab10f 100644
--- a/wq.h
+++ b/wq.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmodmap/wq.h,v 1.5 2001/12/14 20:02:13 dawes Exp $ */
+/* $XFree86: xc/programs/xmodmap/wq.h,v 1.4 2001/01/17 23:46:21 dawes Exp $ */
 
 #ifndef _WQ_H
 #define _WQ_H
diff --git a/xmodmap.c b/xmodmap.c
index 6cdb7f1..a67493f 100644
--- a/xmodmap.c
+++ b/xmodmap.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.9 2003/05/27 22:27:08 tsi Exp $ */
+/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.8tsi Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
diff --git a/xmodmap.h b/xmodmap.h
index 1a9a91c..0d2f779 100644
--- a/xmodmap.h
+++ b/xmodmap.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.5 2001/12/14 20:02:13 dawes Exp $ */
+/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.4 2001/01/17 23:46:21 dawes Exp $ */
 
 extern char *ProgramName;
 extern Display *dpy;
diff --git a/xmodmap.man b/xmodmap.man
index 2597184..34a19e3 100644
--- a/xmodmap.man
+++ b/xmodmap.man
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.13 2003/06/26 10:19:49 eich Exp $
+.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.11 2002/10/12 16:06:48 herrb Exp $
 .\" 
 .de EX		\"Begin example
 .ne 5