From e04839d52cadd3b08c48d86d7416d28e7c89427c Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:48:17 +0000
Subject: Merging XORG-CURRENT into trunk

---
 src/ffb_fspans.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ffb_fspans.c')

diff --git a/src/ffb_fspans.c b/src/ffb_fspans.c
index 4599015..88b5c82 100644
--- a/src/ffb_fspans.c
+++ b/src/ffb_fspans.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
-- 
cgit v1.2.3