Merge branch 'gallium-embedded'

2010-02-03 18:54:13 +00:00
parent f8d824e09a 976afaf98f
commit 45dac0d82a
263 changed files with 1484 additions and 1282 deletions
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -47,7 +47,7 @@

 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_inlines.h"
+#include "util/u_inlines.h"
 #include "util/u_draw_quad.h"
 #include "util/u_simple_shaders.h"
 #include "shader/prog_instruction.h"