readlicense_oo/license/license.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit dc84b16d24d963c2a65265aea78d669c678849b1
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Jun 27 03:15:09 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Jul 1 10:37:49 2024 +0200
licence: Fix div tag and move License Statements
Change-Id: I9547679d0749e1bf539867cb1038c78ef8dcae12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169586
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Tested-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 9fdb50763720a2970ebab39debf26010a8e6bc62)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169681
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
(cherry picked from commit 5ba4736a8e1dcf5c8bea267161630818c117c4ce)
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index 8e6681f883b0..8240347287cb 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2184,12 +2184,6 @@
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="ZXING-CPP">
- <h2>ZXing-C++</h2>
- <p>The following software may be included in this product: ZXing-C++.
Use of any of this software is governed
- by the terms of the license below:</p>
- <p><a href="#a__Apache_License_version_2_0">Jump to Apache License
Version 2.0</a></p>
- </div>
<div class="ZLIB">
<h2>zlib</h2>
<p>The following software may be included in this product: zlib. Use
of any of this software is governed by the
@@ -2206,6 +2200,12 @@
original software.</p>
<p>3. This notice may not be removed or altered from any source
distribution.</p>
</div>
+ <div class="ZXING">
+ <h2>ZXing-C++</h2>
+ <p>The following software may be included in this product: ZXing-C++.
Use of any of this software is governed
+ by the terms of the license below:</p>
+ <p><a href="#a__Apache_License_version_2_0">Jump to Apache License
Version 2.0</a></p>
+ </div>
<div class="SKIA">
<h2>Skia</h2>
<p>The following software may be included in this product: Skia. Use
of any of this software is governed by
