Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 18:43:06 +00:00
parent 17d50f3cdc
commit 3b8859eca5
2 changed files with 2 additions and 2 deletions

View file

@ -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.

View file

@ -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