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
commit495c71ddaaeeebab3efe7d3d73d7c5168e3803c5 (patch)
treeb69c484c3ee6a886998bfeb911343672c53e5966
parent186ca3a9e37a23c639a0661f06d014b6dbb82eea (diff)
Merging XORG-CURRENT into trunk
-rw-r--r--xf86misc.h2
-rw-r--r--xf86mscstr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/xf86misc.h b/xf86misc.h
index ba1db79..f5d7a56 100644
--- a/xf86misc.h
+++ b/xf86misc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */
/*
* Copyright (c) 1995, 1996 The XFree86 Project, Inc
diff --git a/xf86mscstr.h b/xf86mscstr.h
index e514740..4e527b8 100644
--- a/xf86mscstr.h
+++ b/xf86mscstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */
/*
* Copyright (c) 1995, 1996 The XFree86 Project, Inc