From 1306fc22dd19c5b3e85fb839e4c23f57d86b8146 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:26:30 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- xf86misc.h | 2 +- xf86mscstr.h | 2 +- 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 -- cgit v1.2.3