projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin/master' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
common
/
texmem.c
diff --git
a/src/mesa/drivers/dri/common/texmem.c
b/src/mesa/drivers/dri/common/texmem.c
index b4af7c96e385845c67fe87bb517cc9a02df62dbe..ff174a251d28301a39a5664dd045f31e612a9a0c 100644
(file)
--- a/
src/mesa/drivers/dri/common/texmem.c
+++ b/
src/mesa/drivers/dri/common/texmem.c
@@
-43,10
+43,10
@@
*/
#include "texmem.h"
-#include "simple_list.h"
-#include "imports.h"
-#include "macros.h"
-#include "texformat.h"
+#include "
main/
simple_list.h"
+#include "
main/
imports.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
texformat.h"
#include <assert.h>