From 2fb588620030ad393f8500d60e16144d59e4effe Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 19:54:30 +0000 Subject: Merging XORG-CURRENT into trunk --- miext/shadow/shadow.c | 2 +- miext/shadow/shadow.h | 2 +- miext/shadow/shalloc.c | 2 +- miext/shadow/shpacked.c | 2 +- miext/shadow/shplanar.c | 2 +- miext/shadow/shplanar8.c | 2 +- miext/shadow/shrot16pack.c | 2 +- miext/shadow/shrot16pack_180.c | 2 +- miext/shadow/shrot16pack_270.c | 2 +- miext/shadow/shrot16pack_90.c | 2 +- miext/shadow/shrot32pack.c | 2 +- miext/shadow/shrot32pack_180.c | 2 +- miext/shadow/shrot32pack_270.c | 2 +- miext/shadow/shrot32pack_90.c | 2 +- miext/shadow/shrot8pack.c | 2 +- miext/shadow/shrot8pack_180.c | 2 +- miext/shadow/shrot8pack_270.c | 2 +- miext/shadow/shrot8pack_90.c | 2 +- miext/shadow/shrotate.c | 2 +- miext/shadow/shrotpack.h | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) (limited to 'miext/shadow') diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 38a92953f..260c840a5 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.15 2003/11/10 18:22:51 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.14tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index d8ade93dc..d343a171f 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.7 2002/12/02 20:37:24 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.6tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 028ec26a5..9edd8338e 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.1 2000/09/07 23:12:15 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 818a37a8e..441409776 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.5 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.4 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index 148782956..aaa6d58eb 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index c82b5f931..3d4a3724d 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index a1ff273de..16b146352 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index 7ba41833e..3786444d4 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index 0b3c4e0ac..d2c9271f4 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index 574b3a157..36cf94489 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 327636efb..3ef791608 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index 838622267..943d6485e 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index b0dd28316..0038c624c 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 9bdb18e25..1183ba65a 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index 7af181f19..885c5e9a2 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack.c,v 1.1 2000/09/08 21:46:46 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 316c0c690..7bdb2a932 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index bed542f6d..483f05f79 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index f2618fc47..8c93d21ed 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index 1277c2ee1..a0f5b6e06 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.5 2002/10/09 17:00:11 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.4tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index ce9b4c561..507cabb56 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * -- cgit v1.2.3