summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:43:06 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:43:06 +0000
commitdb4eac7ce2a2e20269f24a98470c9a3c5fa7fbef (patch)
tree95516047ad2ee8e190aae691218c58678d30ff85
parent2b5b1ea58df1a9ab378c06f08ec26e44e2a03504 (diff)
downloadxorg-proto-renderproto-db4eac7ce2a2e20269f24a98470c9a3c5fa7fbef.tar.gz
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
-rw-r--r--render.h2
-rw-r--r--renderproto.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/render.h b/render.h
index a596667..e44754c 100644
--- a/render.h
+++ b/render.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/include/extensions/render.h,v 1.11 2002/11/23 02:34:45 keithp Exp $
+ * $XFree86: xc/include/extensions/render.h,v 1.10 2002/11/06 22:47:49 keithp Exp $
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/renderproto.h b/renderproto.h
index 7717d9f..4b5da46 100644
--- a/renderproto.h
+++ b/renderproto.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/include/extensions/renderproto.h,v 1.13 2002/11/23 02:34:45 keithp Exp $
+ * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $
*
* Copyright © 2000 SuSE, Inc.
*