From b8e13e5f978d8d3666128ec759f6134187180793 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 4 Mar 2004 17:46:24 +0000 Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files that had a changed license. There was only one change which happened to be from me (Egbert Eich). --- randr.h | 2 +- randrproto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/randr.h b/randr.h index 9ff39c0..af3e4ed 100644 --- a/randr.h +++ b/randr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/include/extensions/randr.h,v 1.6 2002/10/14 18:01:38 keithp Exp $ + * $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randrproto.h b/randrproto.h index 6f06b52..a28358f 100644 --- a/randrproto.h +++ b/randrproto.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/include/extensions/randrproto.h,v 1.8 2002/10/14 18:01:38 keithp Exp $ + * $XFree86: xc/include/extensions/randrproto.h,v 1.6 2002/09/29 23:39:43 keithp Exp $ * * Copyright © 2000 Compaq Computer Corporation * Copyright © 2002 Hewlett-Packard Company -- cgit v1.2.1