diff options
| author | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
| commit | f7922db610d05efee0ee8c5f0dadb69e3939482e (patch) | |
| tree | accfc0fdd96e1f572213cf69ea365c01bda0ef46 /src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c | |
| parent | 759fa5fcc8038af4845a6d9c57b75933ef26559c (diff) | |
| parent | 446bfc32a83008e0865ec869bc80b920c907f10f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
src/gallium/drivers/Makefile
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c')
| -rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c index c535d3276c..bffca5b244 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c @@ -34,8 +34,8 @@ */ -#include "p_debug.h" -#include "p_util.h" +#include "pipe/p_debug.h" +#include "pipe/p_util.h" #include "pb_buffer.h" #include "pb_buffer_fenced.h" |