summaryrefslogtreecommitdiff
path: root/Xext/xres.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:54:16 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:54:16 +0000
commit0664db19bf37f9dd69cca6adff4e238e310c3092 (patch)
treed2cc9d3132d40796018a853df38877fa5b027f18 /Xext/xres.c
parent9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'Xext/xres.c')
-rw-r--r--Xext/xres.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Xext/xres.c b/Xext/xres.c
index 28e926642..4f0f9e297 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -1,7 +1,8 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.9 2004/03/04 19:31:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
+/* $XdotOrg$ */
#define NEED_EVENTS
#define NEED_REPLIES