diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
commit | 2fb588620030ad393f8500d60e16144d59e4effe (patch) | |
tree | 07262cbe15a40e5aeae54f62751260f83243ab79 /fb/fbcmap.c | |
parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'fb/fbcmap.c')
-rw-r--r-- | fb/fbcmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fb/fbcmap.c b/fb/fbcmap.c index aeb53b1fb..001277a1d 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -1,5 +1,5 @@ /* $XConsortium: fbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ -/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.6 2001/10/28 03:33:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.5 2000/09/20 00:09:13 keithp Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. |