diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
| commit | 8b6b40b7271acd81a9548f502c18f46f3b640640 (patch) | |
| tree | 1462cb63501a8bdd8845d7c62e038b6a86b78fd5 /include/miscstruct.h | |
| parent | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (diff) | |
| parent | 3305d17195e3a0a5555300555bd7703312fa489f (diff) | |
| download | xserver-pci-rework.tar.gz | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-reworkpci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
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 4f5b1d516..d240f1b28 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -51,7 +51,7 @@ SOFTWARE. #include "misc.h" #include <X11/Xprotostr.h> #include "gc.h" -#include <pixman/pixman.h> +#include <pixman.h> typedef xPoint DDXPointRec; |