diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:27 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:27 +0000 |
| commit | 354933180c848ef9381c89c3d079e18e6d73ca28 (patch) | |
| tree | 27604e4eea1d8e0673643ff8bf4f704f5f3ac305 /src | |
| parent | 40732a273fc791a07ad7cbf26ce4f437a7f1baee (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/Xrandr.c | 2 | ||||
| -rw-r--r-- | src/Xrandrint.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Xrandr.c b/src/Xrandr.c index 6b3e2f5..95563d2 100644 --- a/src/Xrandr.c +++ b/src/Xrandr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.14 2003/05/27 22:26:42 tsi Exp $ + * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.13tsi Exp $ * * Copyright © 2000 Compaq Computer Corporation, Inc. * Copyright © 2002 Hewlett Packard Company, Inc. diff --git a/src/Xrandrint.h b/src/Xrandrint.h index 2ec5d86..87724c9 100644 --- a/src/Xrandrint.h +++ b/src/Xrandrint.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.4 2002/10/14 18:01:40 keithp Exp $ + * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.2 2001/06/07 15:33:43 keithp Exp $ * * * Copyright © 2000, Compaq Computer Corporation, |