Merge branch '0.9.1' into 0.9.2

2011-03-11 00:29:18 +00:00
parent 06c18d08d7 d08c508f01
commit b1e770c63b
12 changed files with 256 additions and 182 deletions
--- a/glm/core/type_int.hpp
+++ b/glm/core/type_int.hpp
@@ -88,7 +88,7 @@ namespace glm
 #elif(GLM_PRECISION & GLM_PRECISION_LOWP_INT)
 	typedef precision::lowp_int					int_t;
 #else
-	typedef mediump_int							int_t;
+	typedef precision::mediump_int							int_t;
 #	pragma message("GLM message: Precisson undefined for signed integer number.");
 #endif//GLM_PRECISION

--- a/glm/core/type_vec4.hpp
+++ b/glm/core/type_vec4.hpp
@@ -15,7 +15,6 @@
 #include "type_int.hpp"
 #include "type_size.hpp"
 #include "_swizzle.hpp"
-#include "_detail.hpp"

 namespace glm
 {