projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
[mesa.git]
/
src
/
mesa
/
swrast
/
s_blend.c
diff --git
a/src/mesa/swrast/s_blend.c
b/src/mesa/swrast/s_blend.c
index 4531f0ae02cf7c161ea376e7f40f2cfabd5a583c..95c83432a9c6cf9dbb85621c160b68ca6f816b64 100644
(file)
--- a/
src/mesa/swrast/s_blend.c
+++ b/
src/mesa/swrast/s_blend.c
@@
-35,10
+35,10
@@
-#include "glheader.h"
-#include "context.h"
-#include "colormac.h"
-#include "macros.h"
+#include "
main/
glheader.h"
+#include "
main/
context.h"
+#include "
main/
colormac.h"
+#include "ma
in/ma
cros.h"
#include "s_blend.h"
#include "s_context.h"