mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2016-11-12 13:42:06 +01:00
parent f294f169fa
commit 26b6c3d34d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
readme.md
View File

@ -50,7 +50,6 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
## Release notes ## Release notes
<<<<<<< HEAD
### [GLM 0.9.9.0](https://github.com/g-truc/glm/releases/latest) - 2017-XX-XX ### [GLM 0.9.9.0](https://github.com/g-truc/glm/releases/latest) - 2017-XX-XX
#### Features: #### Features:
- Added RGBM encoding in GTC_packing #420 - Added RGBM encoding in GTC_packing #420
@ -74,15 +73,11 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Removed GLM_LEFT_HANDED, use GLM_FORCE_LEFT_HANDED instead - Removed GLM_LEFT_HANDED, use GLM_FORCE_LEFT_HANDED instead
--- ---
### [GLM 0.9.8.3](https://github.com/g-truc/glm/tree/0.9.8) - 2016-XX-XX ### [GLM 0.9.8.4](https://github.com/g-truc/glm/tree/0.9.8) - 201X-XX-XX
---
### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12
#### Improvements: #### Improvements:
=======
#### [GLM 0.9.8.4](https://github.com/g-truc/glm/tree/0.9.8) - 201X-XX-XX
#### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12
##### Improvements:
>>>>>>> 0.9.8
- Broader support of GLM_FORCE_UNRESTRICTED_GENTYPE #378 - Broader support of GLM_FORCE_UNRESTRICTED_GENTYPE #378
#### Fixes: #### Fixes: