summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:44:26 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:44:26 +0000
commitbcd2a9f0c3ad8c9c91211a4154e76b7ada4a3ba8 (patch)
tree312a4745841a1cfae98aade5bcc7f5ce54cc505f
parent4eaea987282efecf45ed8f9dce62acdc5d709f31 (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
-rw-r--r--src/XDelAssoc.c2
-rw-r--r--src/XDestAssoc.c2
-rw-r--r--src/XDraw.c2
-rw-r--r--src/XMakeAssoc.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/XDelAssoc.c b/src/XDelAssoc.c
index 7ccf7f1..51db2e1 100644
--- a/src/XDelAssoc.c
+++ b/src/XDelAssoc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.4 2001/12/14 19:57:02 dawes Exp $ */
+/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.3 2001/01/17 19:43:37 dawes Exp $ */
#include "Xlibint.h"
#include "X10.h"
diff --git a/src/XDestAssoc.c b/src/XDestAssoc.c
index ab89e06..d476805 100644
--- a/src/XDestAssoc.c
+++ b/src/XDestAssoc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.4 2001/12/14 19:57:02 dawes Exp $ */
+/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */
#include "Xlibint.h"
#include "X10.h"
diff --git a/src/XDraw.c b/src/XDraw.c
index 03fde2a..4d6f694 100644
--- a/src/XDraw.c
+++ b/src/XDraw.c
@@ -26,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/oldX/XDraw.c,v 1.5 2001/12/14 19:57:02 dawes Exp $ */
+/* $XFree86: xc/lib/oldX/XDraw.c,v 1.4 2001/07/25 15:04:57 dawes Exp $ */
#include "Xlibint.h"
#include "Xlib.h"
diff --git a/src/XMakeAssoc.c b/src/XMakeAssoc.c
index 734313d..162b3e0 100644
--- a/src/XMakeAssoc.c
+++ b/src/XMakeAssoc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.4 2001/12/14 19:57:03 dawes Exp $ */
+/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */
#include "Xlibint.h"
#include "X10.h"