diff options
| author | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
| commit | e6b71530daea3059ee362d4df51575e27e026b22 (patch) | |
| tree | 8df01693aa4bf44360647d79a340cbb4156aa91a /src/gallium/auxiliary/Makefile | |
| parent | 42c7291d2cb50c2bd94dd9346a8402a24303d66d (diff) | |
| parent | 5e3733fadf08178fca7c9f20a0f4783f940383aa (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
Diffstat (limited to 'src/gallium/auxiliary/Makefile')
| -rw-r--r-- | src/gallium/auxiliary/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index 07b3372c914..bf90a704dd4 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -143,7 +143,6 @@ C_SOURCES = \ util/u_transfer.c \ util/u_resource.c \ util/u_upload_mgr.c \ - target-helpers/wrap_screen.c \ vl/vl_bitstream_parser.c \ vl/vl_mpeg12_mc_renderer.c \ vl/vl_compositor.c \ @@ -222,3 +221,4 @@ util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_forma util/u_half.c: util/u_half.py $(PYTHON2) util/u_half.py > $@ +# DO NOT DELETE |