Merge changes from The Witness.

This commit is contained in:
Ignacio
2015-03-24 12:14:49 -07:00
parent 7e2a9d1adb
commit a083337473
57 changed files with 2061 additions and 916 deletions

View File

@ -938,6 +938,22 @@
RelativePath="..\..\..\src\nvtt\CompressorDX9.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT1.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT1.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT5_RGBM.cpp"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorDXT5_RGBM.h"
>
</File>
<File
RelativePath="..\..\..\src\nvtt\CompressorRGB.cpp"
>