diff options
author | Ben Skeggs <[email protected]> | 2008-07-27 00:54:57 +1000 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2008-07-27 00:54:57 +1000 |
commit | 9e445d3e6374c2a9b163f1262ea5a1047e596cae (patch) | |
tree | 7a63f048928947fb57342de9b53a3d0924f50d5b /src/mesa/shader/slang/slang_mem.c | |
parent | d1dc937c62083c3d8ab9f420df8e54f5c3217468 (diff) | |
parent | ff7a7031caa0ac592f210aca696a20c9de6dc0d4 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/shader/slang/slang_mem.c')
-rw-r--r-- | src/mesa/shader/slang/slang_mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/shader/slang/slang_mem.c index e1d1e6ba14e..21d6bfce88d 100644 --- a/src/mesa/shader/slang/slang_mem.c +++ b/src/mesa/shader/slang/slang_mem.c @@ -32,8 +32,8 @@ * \author Brian Paul */ -#include "context.h" -#include "macros.h" +#include "main/context.h" +#include "main/macros.h" #include "slang_mem.h" |