summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_context.c
diff options
context:
space:
mode:
authorPatrice Mandin <pmandin@caramail.com>2007-07-07 00:08:35 +0200
committerPatrice Mandin <pmandin@caramail.com>2007-07-07 00:08:35 +0200
commitf0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch)
treeea9caba04ed3c5b3005edd79060002cb66a5e03a /src/mesa/swrast/s_context.c
parent69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff)
parentf98bdfca574478837b33c97d131dad4833e3ee12 (diff)
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/swrast/s_context.c')
-rw-r--r--src/mesa/swrast/s_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 791850cb50..3956925651 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -31,9 +31,9 @@
#include "context.h"
#include "colormac.h"
#include "mtypes.h"
-#include "prog_statevars.h"
#include "teximage.h"
#include "swrast.h"
+#include "shader/prog_statevars.h"
#include "s_blend.h"
#include "s_context.h"
#include "s_lines.h"