diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 15:33:45 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 15:33:45 -0700 |
| commit | b8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0 (patch) | |
| tree | 5db502ab80287bfc8ff61082784017c7448464f5 /src/mesa/sources.mak | |
| parent | 81722c5d7e8e93d837510b9e6e5d014ec64cf4b3 (diff) | |
| parent | d9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6 (diff) | |
Merge branch 'master' into asm-shader-rework-2
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.tab.h
Diffstat (limited to 'src/mesa/sources.mak')
| -rw-r--r-- | src/mesa/sources.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 9a9c988ed9..fa2a6307a4 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -61,6 +61,7 @@ MAIN_SOURCES = \ main/shared.c \ main/state.c \ main/stencil.c \ + main/syncobj.c \ main/texcompress.c \ main/texcompress_s3tc.c \ main/texcompress_fxt1.c \ |