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 /cfb/cfbcmap.c | |
parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'cfb/cfbcmap.c')
-rw-r--r-- | cfb/cfbcmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index 1830ffa5e..1806916ff 100644 --- a/cfb/cfbcmap.c +++ b/cfb/cfbcmap.c @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.13 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */ #include "X.h" |