Fixed merge

ago%!(EXTRA string=12 years) · b6f5b4121d
parent 61589b8a28 843cc7bd61
commit b6f5b4121d
2 changed files with 3 additions and 3 deletions
--- a/glm/gtx/euler_angles.inl
+++ b/glm/gtx/euler_angles.inl
@ -35,9 +35,9 @@ namespace glm
 		T sinY = glm::sin(angleY);

 		return detail::tmat4x4<T, defaultp>(
-			cosY,	T(0),	sinY,	T(0),
+			cosY,	T(0),	-sinY,	T(0),
 			T(0),	T(1),	T(0),	T(0),
-			-sinY,	T(0),	cosY,	T(0),
+			sinY,	T(0),	cosY,	T(0),
 			T(0),	T(0),	T(0),	T(1));
 	}

--- a/readme.txt
+++ b/readme.txt
@ -67,7 +67,7 @@ GLM 0.9.5.0: 2013-XX-XX
 - Increased unit tests completness

 ================================================================================
-GLM 0.9.4.6: 2013-09-18
+GLM 0.9.4.6: 2013-09-20
 --------------------------------------------------------------------------------
 - Fixed detection to select the last known compiler if newer version #106
 - Fixed is_int and is_uint code duplication with GCC and C++11 #107