Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/privates.c
This commit is contained in:
Eamon Walsh 2007-04-17 12:10:22 -04:00 committed by Eamon Walsh
commit 1f06d32ef5
64 changed files with 1363 additions and 639 deletions

View file

@ -279,7 +279,7 @@ MinorOpcodeOfRequest(ClientPtr client)
}
void
CloseDownExtensions()
CloseDownExtensions(void)
{
int i,j;