Merge private branch.

2008-04-17 06:59:13 +00:00
parent 17a4f765fb
commit 7d3facd81a
10 changed files with 171 additions and 67 deletions
--- a/src/nvimage/BlockDXT.cpp
+++ b/src/nvimage/BlockDXT.cpp
@ -22,6 +22,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.

 #include <nvcore/Stream.h>
+#include <nvcore/Containers.h> // swap

 #include "ColorBlock.h"
 #include "BlockDXT.h"