Fixed merge

glm/gtc/matrix_transform.inl

@@ -272,9 +272,9 @@ namespace glm
 		detail::tmat4x4<valType> Result(valType(0));
 		Result[0][0] = w;
 		Result[1][1] = h;
-		Result[2][2] = (zFar + zNear) / (zFar - zNear);
-		Result[2][3] = -valType(1);
-		Result[3][2] = (valType(2) * zFar * zNear) / (zFar - zNear);
+		Result[2][2] = - (zFar + zNear) / (zFar - zNear);
+		Result[2][3] = - valType(1);
+		Result[3][2] = - (valType(2) * zFar * zNear) / (zFar - zNear);
 		return Result;
 	}
 

glm/gtc/quaternion.hpp

@@ -206,6 +206,13 @@ namespace detail
 		typename detail::tquat<T>::value_type const & angle, 
 		detail::tvec3<T> const & v);
 
+	/// Returns euler angles, yitch as x, yaw as y, roll as z. 
+	/// 
+	/// @see gtc_quaternion
+	template <typename T> 
+	detail::tvec3<T> eulerAngles(
+        detail::tquat<T> const & x);
+    
 	/// Converts a quaternion to a 3 * 3 matrix. 
 	/// 
 	/// @see gtc_quaternion

glm/gtc/quaternion.inl

@@ -31,6 +31,12 @@
 namespace glm{
 namespace detail
 {
+    template <typename T>
+    GLM_FUNC_QUALIFIER typename tquat<T>::size_type tquat<T>::length() const
+    {
+        return 4;
+    }
+
     template <typename T> 
     GLM_FUNC_QUALIFIER tquat<T>::tquat() : 
         x(0),
@@ -498,6 +504,15 @@ namespace detail
         //return gtc::quaternion::cross(q, detail::tquat<T>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
 	}
 
+	template <typename T> 
+	GLM_FUNC_QUALIFIER detail::tvec3<T> eulerAngles
+	(
+        detail::tquat<T> const & x
+    )
+	{
+		return detail::tvec3<T>(pitch(x), yaw(x), roll(x));
+	}
+    
     template <typename T> 
     GLM_FUNC_QUALIFIER detail::tmat3x3<T> mat3_cast
 	(

glm/gtx/quaternion.hpp

@@ -199,7 +199,7 @@ namespace glm
 	template <typename valType> 
 	valType yaw(
 		detail::tquat<valType> const & x);
-		
+
 	/// Returns euler angles, yitch as x, yaw as y, roll as z. 
 	///
 	/// @see gtx_quaternion

glm/gtx/quaternion.inl

@@ -254,15 +254,6 @@ namespace glm
 #endif
 	}
 
-	template <typename valType> 
-	GLM_FUNC_QUALIFIER detail::tvec3<valType> eulerAngles
-	(
-		detail::tquat<valType> const & x
-	)
-	{
-		return detail::tvec3<valType>(pitch(x), yaw(x), roll(x));
-	}
-
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tquat<T> shortMix
 	(