diff options
author | marha <marha@users.sourceforge.net> | 2012-07-02 08:51:35 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-02 08:51:35 +0200 |
commit | fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817 (patch) | |
tree | bcc60a76e7cc205710b91c67ff700c26886ea3e8 /mesalib/src/gallium/auxiliary/Makefile.sources | |
parent | 393178cdbca247c6ad077f7dab9a97d6817c625c (diff) | |
parent | fdef5bff99e6079f64bc6b91c91b42195c85adeb (diff) | |
download | vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.tar.gz vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.tar.bz2 vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/gallium/auxiliary/Makefile.sources')
-rw-r--r-- | mesalib/src/gallium/auxiliary/Makefile.sources | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/Makefile.sources b/mesalib/src/gallium/auxiliary/Makefile.sources index 277428b38..28a176d68 100644 --- a/mesalib/src/gallium/auxiliary/Makefile.sources +++ b/mesalib/src/gallium/auxiliary/Makefile.sources @@ -155,8 +155,7 @@ GENERATED_SOURCES := \ indices/u_indices_gen.c \ indices/u_unfilled_gen.c \ util/u_format_srgb.c \ - util/u_format_table.c \ - util/u_half.c + util/u_format_table.c GALLIVM_SOURCES := \ gallivm/lp_bld_arit.c \ |