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

---
 cfb/cfbbres.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cfb/cfbbres.c')

diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c
index 452259581..b306ee80b 100644
--- a/cfb/cfbbres.c
+++ b/cfb/cfbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.4 2001/01/17 22:36:34 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
-- 
cgit v1.2.3