diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-28 07:25:21 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-28 07:25:21 -0400 |
| commit | 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 (patch) | |
| tree | 2e720a9d55fe3cf65e735c8ce66866fb8c749d18 /include/miscstruct.h | |
| parent | 860a09cfb8afc0a293c7eb5e01762724eb86847a (diff) | |
| parent | 7d54399cfdaa7f54e28828267a76b89c4e8e798f (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
Diffstat (limited to 'include/miscstruct.h')
| -rw-r--r-- | include/miscstruct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/miscstruct.h b/include/miscstruct.h index 81f699ad1..409b102c0 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -50,7 +50,7 @@ SOFTWARE. #include "misc.h" #include <X11/Xprotostr.h> -#include <pixman/pixman.h> +#include <pixman.h> typedef xPoint DDXPointRec; |