summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-03 12:11:30 +0000
committerEgbert Eich <eich@suse.de>2004-03-03 12:11:30 +0000
commitd5b14ebddf3dd3ca09a98f9c185fcb76822d3644 (patch)
treec0a24a87d11c237a750d87562617636c99b4ced9
parentfa532ec60428670bbcb68c9a5caee8c85da97e8b (diff)
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0
-rw-r--r--man/Xss.man2
-rw-r--r--src/XScrnSaver.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/Xss.man b/man/Xss.man
index 96232db..73d8afe 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 $
.\"
.\" 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