[Libreoffice-commits] core.git: readlicense_oo/license

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 27 07:38:53 UTC 2019


 readlicense_oo/license/license.xml |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

New commits:
commit dec642b5cfdd3ba2e38b45b319d79e4bb7429a1a
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Mar 26 23:23:03 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 27 08:38:23 2019 +0100

    license: add OpenGL Mathematics (GLM)
    
    Change-Id: Ia90e817eb9bcb7ce4e634c15e95206d90c3b957d
    Reviewed-on: https://gerrit.libreoffice.org/69778
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 393d5b6335c8..15f8d6b0017f 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -409,6 +409,24 @@
         ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
         PERFORMANCE OF THIS SOFTWARE.</p>
     </div>
+    <div class="GLM">
+        <h2>GLM</h2>
+        <p>The following software may be included in this product: OpenGL Mathematics (GLM). Use of any of this
+        software is governed by the terms of the license below:</p>
+        <h3>The MIT License</h3>
+        <p>Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)</p>
+        <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+        documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+        the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+        and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+        <p>The above copyright notice and this permission notice shall be included in all copies or substantial
+        portions of the Software.</p>
+        <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+        LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+        SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+        ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+        OTHER DEALINGS IN THE SOFTWARE.</p>
+    </div>
     <div class="GRAPHITE">
         <h2>Graphite2</h2>
         <p>The following software may be included in this product: Graphite2. Use of any of this software is governed


More information about the Libreoffice-commits mailing list