From 12cdd55336d661db32b21456fa161b0611432f78 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:32:11 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

---
 b4light.c       | 2 +-
 beforelight.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/b4light.c b/b4light.c
index 6db65af..9a125f9 100644
--- a/b4light.c
+++ b/b4light.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/beforelight/b4light.c,v 3.7 2003/10/24 20:38:10 tsi Exp $ */
+/* $XFree86: xc/programs/beforelight/b4light.c,v 3.6tsi Exp $ */
 
 #include <X11/Xatom.h>
 #include <X11/Intrinsic.h>
diff --git a/beforelight.man b/beforelight.man
index ed6ce50..bdde823 100644
--- a/beforelight.man
+++ b/beforelight.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" $XFree86: xc/programs/beforelight/b4light.man,v 3.2 2001/02/09 03:47:56 tsi Exp $
+.\" $XFree86: xc/programs/beforelight/b4light.man,v 3.1 2001/01/27 18:21:00 dawes Exp $
 .\"
 .TH beforelight 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3