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/squish/alpha.h
+++ b/src/nvtt/squish/alpha.h
@ -26,7 +26,7 @@
 #ifndef SQUISH_ALPHA_H
 #define SQUISH_ALPHA_H

-#include <squish.h>
+#include "squish.h"

 namespace squish {

--- a/src/nvtt/squish/squish.cpp
+++ b/src/nvtt/squish/squish.cpp
@ -23,7 +23,7 @@
 	
   -------------------------------------------------------------------------- */
   
-#include <squish.h>
+#include "squish.h"
 #include "colourset.h"
 #include "maths.h"
 #include "rangefit.h"