Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 19:54:30 +00:00
commit 2fb5886200
1188 changed files with 20614 additions and 3558 deletions

View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */
/*
Copyright 1987, 1998 The Open Group