readlicense_oo/license/LICENSE | 4 ++--
readlicense_oo/license/LICENSE.fodt | 4 ++--
readlicense_oo/license/LICENSE.html | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1d5e875a6c61ddc9fbf0ed09878b7dfb75f89fe3
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Thu Jun 26 08:44:15 2014 +0200
libgltf: fix typo in license
Change-Id: I0e5f3afb19c2457c5ccca922e75e617312801ab9
diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index c010c8f..2e23527 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -1079,13 +1079,13 @@ libgltf
The following software may be included in this product: libgltf. Use
of any of this software is governed by the terms of the license below:
- License for libgltf except trackbal.h and trackball.cpp source files:
+ License for libgltf except trackball.h and trackball.cpp source files:
MPL 2
See MPL Version 2 below
- License for trackbal.h and trackball.cpp source files:
+ License for trackball.h and trackball.cpp source files:
(c) Copyright 1993, 1994, Silicon Graphics, Inc.
ALL RIGHTS RESERVED
diff --git a/readlicense_oo/license/LICENSE.fodt
b/readlicense_oo/license/LICENSE.fodt
index 6ca14cf..c3c69b1 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -3570,10 +3570,10 @@
<text:p text:style-name="P18"><text:a xlink:type="simple"
xlink:href="#Mozilla Public License Version 2.0|outline"><text:span
text:style-name="T17">Jump to MPL Version </text:span></text:a><text:a
xlink:type="simple" xlink:href="#Mozilla Public License Version
2.0|outline"><text:span text:style-name="T17">2</text:span></text:a></text:p>
<text:h text:style-name="P76"
text:outline-level="2"><text:soft-page-break/>lib<text:span
text:style-name="T29">gltf</text:span></text:h>
<text:p text:style-name="P50">The following software may be included in
this product: <text:span text:style-name="T7">libgltf</text:span>. Use of any
of this software is governed by the terms of the license below:</text:p>
- <text:p text:style-name="P150"><text:span text:style-name="T2">License for
libgltf except trackbal.h and trackball.cpp source
files:</text:span>

</text:p>
+ <text:p text:style-name="P150"><text:span text:style-name="T2">License for
libgltf except trackball.h and trackball.cpp source
files:</text:span>

</text:p>
<text:p text:style-name="P150">MPL 2
</text:p>
<text:p text:style-name="P150">
<text:a xlink:type="simple"
xlink:href="#Mozilla Public License Version 2.0|outline"><text:span
text:style-name="T17">Jump to MPL Version </text:span></text:a><text:a
xlink:type="simple" xlink:href="#Mozilla Public License Version
2.0|outline"><text:span text:style-name="T17">2</text:span></text:a></text:p>
- <text:p text:style-name="P150">
<text:span
text:style-name="T2">License for trackbal.h and trackball.cpp source
files:</text:span></text:p>
+ <text:p text:style-name="P150">
<text:span
text:style-name="T2">License for trackball.h and trackball.cpp source
files:</text:span></text:p>
<text:p text:style-name="P51">(c) Copyright 1993, 1994, Silicon Graphics,
Inc. <text:line-break/>ALL RIGHTS RESERVED </text:p>
<text:p text:style-name="P51">Permission to use, copy, modify, and
distribute this software for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that both the
copyright notice and this permission notice appear in supporting documentation,
and that the name of Silicon Graphics, Inc. not be used in advertising or
publicity pertaining to distribution of the software without specific, written
prior permission. </text:p>
<text:p text:style-name="P51">THE MATERIAL EMBODIED ON THIS SOFTWARE IS
PROVIDED TO YOU "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS,
IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. <text:s/>IN NO EVENT SHALL
SILICON GRAPHICS, INC. <text:s/>BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR NOT SILICON
GRAPHICS, INC. <text:s/>HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSS,
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION
WITH THE POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE. </text:p>
diff --git a/readlicense_oo/license/LICENSE.html
b/readlicense_oo/license/LICENSE.html
index 5dd870d..f915022 100644
--- a/readlicense_oo/license/LICENSE.html
+++ b/readlicense_oo/license/LICENSE.html
@@ -1142,13 +1142,13 @@ to MPL Version </A><A HREF="#Mozilla Public License
Version 2.0|outline">2</A></
following software may be included in this product: libgltf. Use of
any of this software is governed by the terms of the license below:</P>
<H3 CLASS="western">License
-for libgltf except trackbal.h and trackball.cpp source files:</H3>
+for libgltf except trackball.h and trackball.cpp source files:</H3>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">MPL
2</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in"><A
HREF="#Mozilla Public License Version 2.0|outline">Jump
to MPL Version </A><A HREF="#Mozilla Public License Version
2.0|outline">2</A></P>
<H3 CLASS="western">License
-for trackbal.h and trackball.cpp source files:</H3>
+for trackball.h and trackball.cpp source files:</H3>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">(c)
Copyright 1993, 1994, Silicon Graphics, Inc.</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">ALL
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
