diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:55 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:55 +0000 |
commit | 3bb9e7d92569600697ec398e9cff01e50101ff22 (patch) | |
tree | 13d88a7c83f92d440df64fbb4179fed37d19ec22 /src | |
parent | 91ddef6b5dec497a7501fc7a9416cfc6454824f3 (diff) |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src')
-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> |