Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h
This commit is contained in:
Eamon Walsh 2007-08-02 14:27:03 -04:00 committed by Eamon Walsh
commit e34fcd2bf4
755 changed files with 15820 additions and 5805 deletions

View file

@ -1,6 +1,4 @@
/*
* Id: fbpixmap.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
*
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its