From 261238bb80cc1bbcc0044e440c81294dbbb03d82 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:47:31 +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).

---
 constype.c   | 2 +-
 constype.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/constype.c b/constype.c
index 83a3b03..10e9621 100644
--- a/constype.c
+++ b/constype.c
@@ -17,7 +17,7 @@
  *
  * Author:  Doug Moran, SRI
  */
-/* $XFree86: xc/programs/Xserver/hw/sun/constype.c,v 3.9 2003/11/21 05:17:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/sun/constype.c,v 3.8 2003/10/07 21:40:07 herrb Exp $ */
 
 /*
 SUN-SPOTS DIGEST         Thursday, 17 March 1988       Volume 6 : Issue 31
diff --git a/constype.man b/constype.man
index b09bc32..9d7f5e0 100644
--- a/constype.man
+++ b/constype.man
@@ -1,6 +1,6 @@
 .\" $Xorg: constype.man,v 1.3 2000/08/17 19:48:29 cpqbld Exp $
 .\"
-.\" $XFree86: xc/programs/Xserver/hw/sun/constype.man,v 1.6 2001/01/27 18:20:41 dawes Exp $
+.\" $XFree86$
 .\"
 .TH CONSTYPE 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3