Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular

This commit is contained in:
Alan Coopersmith
2006-08-10 10:37:59 -07:00
1265 changed files with 5179 additions and 5951 deletions

View File

@@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
#ifndef DIXSTRUCT_H
#define DIXSTRUCT_H