summaryrefslogtreecommitdiff
path: root/GL/glx/glxscreens.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 /GL/glx/glxscreens.c
parent9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'GL/glx/glxscreens.c')
-rw-r--r--GL/glx/glxscreens.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 1a64b0e19..f78b4a284 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.15 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.14 2004/02/09 23:46:31 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free