summaryrefslogtreecommitdiff
path: root/Xext/shape.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/shape.c
parent9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'Xext/shape.c')
-rw-r--r--Xext/shape.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Xext/shape.c b/Xext/shape.c
index 956a8ebfc..8f5c3dba0 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group