diff --git a/copying.txt b/copying.txt index 0b3b5acf..ec06e46e 100644 --- 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 diff --git a/readme.txt b/readme.txt index c79b2003..54890b84 100644 --- 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) @@ -73,6 +74,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