diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | 33d9a5a093de00281605209384711c3e49be6b6d (patch) | |
| tree | 809ee513302aa34e72d23d12f4a5a99a03b5d5fd | |
| parent | 7ad444f10407c94b55911966c10cba0533cf8f74 (diff) | |
| download | xorg-proto-randrproto-XORG-CURRENT.tar.gz | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
| -rw-r--r-- | randr.h | 2 | ||||
| -rw-r--r-- | randrproto.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 |