Fixed merge

This commit is contained in:
Christophe Riccio 2013-09-19 21:46:51 +02:00
commit b6f5b4121d
2 changed files with 3 additions and 3 deletions

View File

@ -35,9 +35,9 @@ namespace glm
T sinY = glm::sin(angleY); T sinY = glm::sin(angleY);
return detail::tmat4x4<T, defaultp>( 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), 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)); T(0), T(0), T(0), T(1));
} }

View File

@ -67,7 +67,7 @@ GLM 0.9.5.0: 2013-XX-XX
- Increased unit tests completness - 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 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 - Fixed is_int and is_uint code duplication with GCC and C++11 #107