diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
commit | aabcfe925c7c717f319ca9fcf6392341e8a7e9df (patch) | |
tree | fde809b45b3172d1bd127627cffd8e754075a3cc | |
parent | 12acdc27d21c6e3784ee70a4dc75096503f4a35c (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | SCCDFile.h | 2 | ||||
-rw-r--r-- | loadData.c | 2 | ||||
-rw-r--r-- | xcmsdb.c | 2 | ||||
-rw-r--r-- | xcmsdb.man | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -28,7 +28,7 @@ * X Device Color Characterization Convention (XDCCC). * */ -/* $XFree86: xc/programs/xcmsdb/SCCDFile.h,v 1.4 2001/01/17 23:45:19 dawes Exp $ */ +/* $XFree86: xc/programs/xcmsdb/SCCDFile.h,v 1.3 1999/03/02 11:49:36 dawes Exp $ */ #ifndef SCCDFILE_H #define SCCDFILE_H @@ -31,7 +31,7 @@ * * */ -/* $XFree86: xc/programs/xcmsdb/loadData.c,v 3.4 2003/09/24 02:43:38 dawes Exp $ */ +/* $XFree86: xc/programs/xcmsdb/loadData.c,v 3.3 2001/07/25 15:05:18 dawes Exp $ */ /* * INCLUDES @@ -29,7 +29,7 @@ * Characterization Data from the root window of the screen. * */ -/* $XFree86: xc/programs/xcmsdb/xcmsdb.c,v 1.6 2001/04/01 14:00:19 tsi Exp $ */ +/* $XFree86: xc/programs/xcmsdb/xcmsdb.c,v 1.5 2001/01/17 23:45:19 dawes Exp $ */ /* * INCLUDES @@ -24,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/xcmsdb/xcmsdb.man,v 1.7 2001/12/14 20:01:18 dawes Exp $ +.\" $XFree86: xc/programs/xcmsdb/xcmsdb.man,v 1.6 2001/01/27 18:21:09 dawes Exp $ .\" .TH XCMSDB 1 __xorgversion__ .SH NAME |