Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich
2004-04-23 19:54:30 +00:00
parent 0664db19bf
commit 2fb5886200
1188 changed files with 20605 additions and 3549 deletions

View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
/* $XFree86$ */
#ifndef PIXMAP_H
#define PIXMAP_H