diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:22 +0000 |
| commit | 5b6ea4938668fe060e591b2ef273183d0e3aea6f (patch) | |
| tree | 727c4d24a77fb45b83d5f8e5d470dc81aa647d91 /src/display.c | |
| parent | 7a7335496b33ed9b516fddf6a86e4034ea098aa2 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).
Diffstat (limited to 'src/display.c')
| -rw-r--r-- | src/display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/display.c b/src/display.c index 1f41a57..ca91c01 100644 --- a/src/display.c +++ b/src/display.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xcursor/display.c,v 1.6 2003/02/20 03:13:50 dawes Exp $ + * $XFree86: xc/lib/Xcursor/display.c,v 1.5 2002/11/27 05:35:10 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * |