anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Merge branch '0.9.6'

Browse Source
master
Christophe Riccio ago%!(EXTRA string=11 years)
parent 4ad2ad84a8 d8576b94f3
commit 3b93835801
2 changed files with 7 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      copying.txt
  2. 4
      readme.txt

7
copying.txt
Unescape View File

@ -1,12 +1,13 @@
================================================================================ ================================================================================
OpenGL Mathematics (GLM) OpenGL Mathematics (GLM)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
GLM is licensed under The Happy Bunny License and MIT License GLM can be distributed and/or modified under the terms of either
a) The Happy Bunny License, or b) the MIT License.
================================================================================ ================================================================================
The Happy Bunny License (Modified MIT License) The Happy Bunny License (Modified MIT License)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Copyright (c) 2005 - 2014 G-Truc Creation Copyright (c) 2005 - 2015 G-Truc Creation
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -33,7 +34,7 @@ THE SOFTWARE.
================================================================================ ================================================================================
The MIT License The MIT License
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Copyright (c) 2005 - 2014 G-Truc Creation Copyright (c) 2005 - 2015 G-Truc Creation
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

4
readme.txt
Unescape View File

@ -1,7 +1,8 @@
================================================================================ ================================================================================
OpenGL Mathematics (GLM) OpenGL Mathematics (GLM)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
GLM is licensed under The Happy Bunny License and MIT License GLM can be distributed and/or modified under the terms of either
a) The Happy Bunny License, or b) the MIT License.
================================================================================ ================================================================================
The Happy Bunny License (Modified MIT License) The Happy Bunny License (Modified MIT License)
@ -79,6 +80,7 @@ Improvements:
- Removed assert for perspective with zFar < zNear #298 - Removed assert for perspective with zFar < zNear #298
- Added Visual Studio natvis support for vec1, quat and dualqual types - Added Visual Studio natvis support for vec1, quat and dualqual types
- Cleaned up C++11 feature detections - Cleaned up C++11 feature detections
- Clarify GLM licensing
Fixes: Fixes:
- Fixed faceforward build #289 - Fixed faceforward build #289

Write Preview
Loading…
Cancel
Save