Fixed merge

This commit is contained in:
Christophe Riccio
2013-03-16 18:16:36 +01:00
6 changed files with 157 additions and 45 deletions

View File

@@ -46,7 +46,7 @@ GLM 0.9.5.0: 2013-XX-XX
- Added rotation function to GTX_quaternion (#22)
================================================================================
GLM 0.9.4.3: 2013-0X-XX
GLM 0.9.4.3: 2013-03-17
--------------------------------------------------------------------------------
- Detected qualifier for Clang
- Fixed C++11 mode for GCC, couldn't be enabled without MS extensions
@@ -54,6 +54,9 @@ GLM 0.9.4.3: 2013-0X-XX
- Fixed GTX_polar_coordinates euclidean function, takes a vec2 instead of a vec3
- Clarify the license applying on the manual
- Added a docx copy of the manual
- Fixed GLM_GTX_matrix_interpolation
- Fixed isnan and isinf on Android with Clang
================================================================================
GLM 0.9.4.2: 2013-02-14