diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
commit | 2fb588620030ad393f8500d60e16144d59e4effe (patch) | |
tree | 07262cbe15a40e5aeae54f62751260f83243ab79 /randr | |
parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'randr')
-rw-r--r-- | randr/mirandr.c | 2 | ||||
-rw-r--r-- | randr/randr.c | 2 | ||||
-rw-r--r-- | randr/randrstr.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/randr/mirandr.c b/randr/mirandr.c index b45a1f9a8..1dc173a96 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.5 2001/06/04 09:45:40 keithp Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randr.c b/randr/randr.c index c0a8c4bf8..b253ddbab 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.22 2003/11/06 18:38:15 tsi Exp $ + * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.21tsi Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randrstr.h b/randr/randrstr.h index d966cd5b7..48213185c 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.5 2002/09/29 23:39:45 keithp Exp $ * * Copyright © 2000 Compaq Computer Corporation * |