Merge branch 'master' into XACE-SELINUX

Conflicts:

	include/miscstruct.h
	mi/mibstore.c
	mi/midispcur.c
	os/Makefile.am
This commit is contained in:
Eamon Walsh
2007-08-28 07:25:21 -04:00
committed by Eamon Walsh
187 changed files with 2613 additions and 179865 deletions

View File

@@ -50,7 +50,7 @@ SOFTWARE.
#include "misc.h"
#include <X11/Xprotostr.h>
#include <pixman/pixman.h>
#include <pixman.h>
typedef xPoint DDXPointRec;