diff options
author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /mesalib/src/mesa/sources.mak | |
parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'mesalib/src/mesa/sources.mak')
-rw-r--r-- | mesalib/src/mesa/sources.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index e72a1ce1e..1f109fb36 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -83,6 +83,7 @@ MAIN_SOURCES = \ main/texcompress_rgtc.c \ main/texcompress_s3tc.c \ main/texcompress_fxt1.c \ + main/texcompress_etc.c \ main/texenv.c \ main/texformat.c \ main/texgen.c \ |