From b0091cfbc562b1ad909a17b172979dbd5f04b2f0 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 19 Mar 2016 15:38:21 +0100 Subject: [PATCH] Fixed readme --- readme.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/readme.md b/readme.md index 64161fff..1bf66230 100644 --- a/readme.md +++ b/readme.md @@ -51,7 +51,6 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ## Release notes -<<<<<<< HEAD #### [GLM 0.9.8.0](https://github.com/g-truc/glm/releases/latest) - 2016-XX-XX ##### Features: - Added right and left handed projection and clip control support #447 #415 #119 @@ -77,10 +76,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Deprecation: - Removed GLM_FORCE_SIZE_FUNC define -#### [GLM 0.9.7.4](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX -======= #### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19 ->>>>>>> 0.9.7 ##### Fixes: - Fixed asinh and atanh warning with C++98 STL #484 - Fixed polar coordinates function latitude #485