aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri/swrast
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-07 07:22:24 +0100
committermarha <marha@users.sourceforge.net>2011-11-07 07:22:24 +0100
commitaf3f3672e5f77a06a24b1e648ee118f1420b45ae (patch)
tree2f08e1da8d47d44fcbf78f660ee8d99bf162b5f2 /mesalib/src/mesa/drivers/dri/swrast
parent60f8ca2d5842b40b8585c58095787c84edfa9803 (diff)
parent1ed503a856d9753a813951796bc6ba56c42ecd28 (diff)
downloadvcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.gz
vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.bz2
vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.zip
Merge remote-tracking branch 'origin/released'
Conflicts: pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/swrast')
-rw-r--r--mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
index 405bb0fd3..d08d42a81 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -30,7 +30,7 @@
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
#include "main/mtypes.h"
-#include "drisw_util.h"
+#include "dri_util.h"
#ifdef _MSC_VER
#ifdef PUBLIC