diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
| commit | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (patch) | |
| tree | fa1ba494685a71e28a096990a8707680c7cb378b /mesalib/src/mesa/swrast/s_texcombine.c | |
| parent | ae340911c1ba1f98b418bd8f1a487fa4d79491b0 (diff) | |
| parent | 6fda93be42ace9eeab0e82ceebb6798961c9105c (diff) | |
| download | vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.gz vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.bz2 vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texcombine.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texcombine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c index f322663ad..2ac0aaa24 100644 --- a/mesalib/src/mesa/swrast/s_texcombine.c +++ b/mesalib/src/mesa/swrast/s_texcombine.c @@ -29,7 +29,7 @@ #include "main/colormac.h" #include "main/image.h" #include "main/imports.h" -#include "shader/prog_instruction.h" +#include "program/prog_instruction.h" #include "s_context.h" #include "s_texcombine.h" |