Merge changes from the Witness.

This commit is contained in:
castano@gmail.com
2013-06-07 17:53:55 +00:00
parent 634229a842
commit 94d0635285
49 changed files with 1974 additions and 625 deletions

View File

@ -877,6 +877,14 @@
>
</File>
</Filter>
<File
RelativePath="..\..\..\src\nvtt\BlockCompressor.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\BlockCompressor.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\ClusterFit.cpp"
>
@ -1049,14 +1057,6 @@
RelativePath="..\..\..\src\nvtt\CompressorDX9.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorRGB.cpp"
>