Merge changes from the-witness.

2010-10-21 18:44:10 +00:00
parent 5d498d6824
commit bd74a9ffc6
27 changed files with 217 additions and 126 deletions
--- a/src/nvtt/experimental/nvtt_experimental.cpp
+++ b/src/nvtt/experimental/nvtt_experimental.cpp
@ -55,6 +55,3 @@ void nvttCompressImage(NvttImage * img, NvttFormat format)
 	// @@ Invoke appropriate compressor.
 }

-
-
-#endif // NVTT_EXPERIMENTAL_H