Merge 0.9.5

ago%!(EXTRA string=11 years) · 022a6f3294
parent 8a5603342c 9a3781d99a
commit 022a6f3294
2 changed files with 7 additions and 2 deletions
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@ -37,8 +37,8 @@
 #define GLM_VERSION					95
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MINOR			9
-#define GLM_VERSION_PATCH			5
-#define GLM_VERSION_REVISION		1
+#define GLM_VERSION_PATCH			6
+#define GLM_VERSION_REVISION		0

 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Platform
--- a/readme.txt
+++ b/readme.txt
@ -43,6 +43,11 @@ GLM 0.9.6.0: 2014-XX-XX
 - Removed degrees for function parameters
 - Removed GLM_FORCE_RADIANS, active by default

+================================================================================
+GLM 0.9.5.2: 2014-0X-XX
+--------------------------------------------------------------------------------
+
+
 ================================================================================
 GLM 0.9.5.1: 2014-01-11
 --------------------------------------------------------------------------------