summaryrefslogtreecommitdiff
path: root/src/XScrnSaver.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:46:59 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:46:59 +0000
commit8df16e3b0ad6086fbd2c92553e320be97b4b923f (patch)
tree3609d70ef78bcd2292c4440eb012b7b29777e580 /src/XScrnSaver.c
parent1d10d2530b6fbaa2c23af9b45c2a051fe5c163d2 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASE
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/XScrnSaver.c')
-rw-r--r--src/XScrnSaver.c2
1 files changed, 1 insertions, 1 deletions
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