diff options
| author | Ben Skeggs <[email protected]> | 2008-09-30 11:57:45 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-30 11:57:45 +1000 |
| commit | 8cd046c9b1da31e4ff178816bdfe2ee3451a1553 (patch) | |
| tree | 6b9de732a9d75c3005a80b078af0c97b9cb6c0ab /src/mesa/drivers/dri/trident/trident_context.h | |
| parent | 8c14bd6992e338da8e467775b0237c8db7cbe44d (diff) | |
| parent | 5dc8e67078be8b8c42a809311debd275ac7d64a7 (diff) | |
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
Diffstat (limited to 'src/mesa/drivers/dri/trident/trident_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/trident/trident_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/trident/trident_context.h b/src/mesa/drivers/dri/trident/trident_context.h index 82b53df884b..fbbb4a96e78 100644 --- a/src/mesa/drivers/dri/trident/trident_context.h +++ b/src/mesa/drivers/dri/trident/trident_context.h @@ -28,10 +28,10 @@ #define _TRIDENT_CONTEXT_H_ #include "dri_util.h" -#include "macros.h" -#include "mtypes.h" +#include "main/macros.h" +#include "main/mtypes.h" #include "drm.h" -#include "mm.h" +#include "main/mm.h" #define SUBPIXEL_X (0.0F) #define SUBPIXEL_Y (0.125F) |