diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:06 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:06 +0000 |
| commit | 495c71ddaaeeebab3efe7d3d73d7c5168e3803c5 (patch) | |
| tree | b69c484c3ee6a886998bfeb911343672c53e5966 | |
| parent | 186ca3a9e37a23c639a0661f06d014b6dbb82eea (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -rw-r--r-- | xf86misc.h | 2 | ||||
| -rw-r--r-- | xf86mscstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 |