diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-01-31 05:36:33 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-01-31 05:36:33 +0000 |
| commit | bee9964b29b2428ee75e2d1efc0e1d2c2518a417 (patch) | |
| tree | fd733f886743b31f2ac2727e57f05d1a0918a977 /windows/VC8/mesa/gdi/gdi.vcproj | |
| parent | 36a0819ff4ede1af91dcf909106cf20659856384 (diff) | |
| parent | 12eb32e34244db9923cacaaed9ba951b7ac274a4 (diff) | |
Merge remote branch 'origin/master' into lp-binning
Conflicts:
Makefile
src/gallium/auxiliary/util/u_surface.c
src/gallium/drivers/llvmpipe/lp_flush.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_tile_cache.c
src/mesa/state_tracker/st_cb_condrender.c
Diffstat (limited to 'windows/VC8/mesa/gdi/gdi.vcproj')
| -rw-r--r-- | windows/VC8/mesa/gdi/gdi.vcproj | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/windows/VC8/mesa/gdi/gdi.vcproj b/windows/VC8/mesa/gdi/gdi.vcproj index a3dd5ef5b6..220923f905 100644 --- a/windows/VC8/mesa/gdi/gdi.vcproj +++ b/windows/VC8/mesa/gdi/gdi.vcproj @@ -397,6 +397,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c"
>
</File>
@@ -418,6 +422,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\drivers\common\meta.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\include\GL\wmesa.h"
>
</File>
|