Merge branch '0.9.3' into 0.9.4

This commit is contained in:
Christophe Riccio
2012-05-02 13:07:06 +01:00
6 changed files with 117 additions and 30 deletions

View File

@@ -156,4 +156,4 @@ namespace loader_tga
}
}//namespace loader_tga
}//namespace gtx
}//namespace gli
}//namespace gli

View File

@@ -7,7 +7,6 @@
// File : test/gtx/string_cast.cpp
///////////////////////////////////////////////////////////////////////////////////////////////////
#define GLM_MESSAGES
#include <glm/glm.hpp>
#include <glm/gtx/string_cast.hpp>
#include <iostream>