Fixed merge

ago%!(EXTRA string=12 years) · 85ae145cf5
parent e72f18997c 073675d970
commit 85ae145cf5
3 changed files with 11 additions and 5 deletions
--- a/glm/core/type_mat2x4.inl
+++ b/glm/core/type_mat2x4.inl
@ -109,7 +109,7 @@ namespace detail
 	{
 		value_type const Zero(0);
 		this->value[0] = col_type(s, Zero, Zero, Zero);
-		this->value[1] = col_type(Zero, Zero, Zero, Zero);
+		this->value[1] = col_type(Zero, s, Zero, Zero);
 	}

 	template <typename T, precision P>
--- a/readme.txt
+++ b/readme.txt
@ -49,6 +49,12 @@ GLM 0.9.5.0: 2013-XX-XX
 - Added quaternion comparison functions
 - Fixed GTX_multiple for negative value

+================================================================================
+GLM 0.9.4.4: 2013-0X-XX
+--------------------------------------------------------------------------------
+- Fixed slerp when costheta is close to 1
+- Fixed mat4x2 value_type constructor
+
 ================================================================================
 GLM 0.9.4.3: 2013-03-20
 --------------------------------------------------------------------------------