diff options
| author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
| commit | f02f63997ce65530788a6dfcb28f11790a14d938 (patch) | |
| tree | fc6aedb5256bfb84eb170cb82addd2b6605510f8 /src/mesa/SConscript | |
| parent | e95e76e1255a3ad0ce604271301d090337b2e82b (diff) | |
| parent | 9778731732b4753e79a1b786c65325a52392411d (diff) | |
Merge branch 'master' into r300-compiler
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
Diffstat (limited to 'src/mesa/SConscript')
| -rw-r--r-- | src/mesa/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 6617c9dbe5..cad5676320 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -84,6 +84,7 @@ if env['platform'] != 'winddk': 'main/shared.c', 'main/state.c', 'main/stencil.c', + 'main/syncobj.c', 'main/texcompress.c', 'main/texcompress_s3tc.c', 'main/texcompress_fxt1.c', |