diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:30 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:30 +0000 |
commit | fdddf201078615cbee160d42ce808a03f5bff89b (patch) | |
tree | c965d7b13c139f76638eefba4b1371afc1f71005 /src/s3_cursor.c | |
parent | ada3222ee9b3465ff3852e3116db3a419f50b28e (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/s3_cursor.c')
-rw-r--r-- | src/s3_cursor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s3_cursor.c b/src/s3_cursor.c index 7a098a1..64a52f1 100644 --- a/src/s3_cursor.c +++ b/src/s3_cursor.c @@ -24,7 +24,7 @@ * * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_cursor.c,v 1.2 2003/07/17 08:19:36 eich Exp $ */ +/* $XFree86: $ */ #include "xf86.h" #include "xf86_OSproc.h" |