diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:28 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:28 +0000 |
| commit | 36c4074d2ef0e59c9c5732510c1fa6f0f531ab53 (patch) | |
| tree | 3609d70ef78bcd2292c4440eb012b7b29777e580 | |
| parent | 1d10d2530b6fbaa2c23af9b45c2a051fe5c163d2 (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).
| -rw-r--r-- | man/Xss.man | 2 | ||||
| -rw-r--r-- | src/XScrnSaver.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/Xss.man b/man/Xss.man index 73eb047..7442088 100644 --- a/man/Xss.man +++ b/man/Xss.man @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/lib/Xss/Xss.man,v 1.2 2003/11/23 05:05:01 dawes Exp $ +.\" $XFree86: xc/lib/Xss/Xss.man,v 1.1 2003/10/26 19:00:24 herrb Exp $ .\" $XdotOrg: xc/lib/Xss/Xss.man,v 1.2 2003/11/23 05:05:01 dawes Exp $ .\" .\" Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved. diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c index 120d8b2..3727ae4 100644 --- a/src/XScrnSaver.c +++ b/src/XScrnSaver.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.2 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.1 2001/10/28 03:32:40 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES |