Merge branch '0.9.6'

ago%!(EXTRA string=10 years) · 3b93835801
parent 4ad2ad84a8 d8576b94f3
commit 3b93835801
2 changed files with 7 additions and 4 deletions
--- a/copying.txt
+++ b/copying.txt
@ -1,12 +1,13 @@
 ================================================================================
 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)
 --------------------------------------------------------------------------------
-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
 of this software and associated documentation files (the "Software"), to deal
@ -33,7 +34,7 @@ THE SOFTWARE.
 ================================================================================
 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
 of this software and associated documentation files (the "Software"), to deal
--- a/readme.txt
+++ b/readme.txt
@ -1,7 +1,8 @@
 ================================================================================
 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)
@ -79,6 +80,7 @@ Improvements:
 - Removed assert for perspective with zFar < zNear #298
 - Added Visual Studio natvis support for vec1, quat and dualqual types
 - Cleaned up C++11 feature detections
+- Clarify GLM licensing

 Fixes:
 - Fixed faceforward build #289