Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 18:54:16 +00:00
commit 0664db19bf
265 changed files with 1251 additions and 313 deletions

View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
/* $XFree86$ */
/****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991, 1992 by