diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
| commit | 9751acb8d8e64e86468f01dd2ce542aad370aebc (patch) | |
| tree | 13d88a7c83f92d440df64fbb4179fed37d19ec22 | |
| parent | 7688732e6c2c04ec313cb06263800916094bd21e (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-- | src/XRecord.c | 2 | ||||
| -rw-r--r-- | src/XTest.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/XRecord.c b/src/XRecord.c index a003c78..db1264e 100644 --- a/src/XRecord.c +++ b/src/XRecord.c @@ -50,7 +50,7 @@ from The Open Group. /* * By Stephen Gildea, X Consortium, and Martha Zimet, NCD. */ -/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.7 2003/09/13 21:33:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.6 2002/10/16 00:37:33 dawes Exp $ */ #include <stdio.h> #include <assert.h> diff --git a/src/XTest.c b/src/XTest.c index 1542dd9..2c3ae2b 100644 --- a/src/XTest.c +++ b/src/XTest.c @@ -30,7 +30,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xtst/XTest.c,v 1.6 2002/10/16 00:37:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xtst/XTest.c,v 1.5 2001/12/14 19:56:40 dawes Exp $ */ #define NEED_REPLIES #include <X11/Xlibint.h> |