You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/01/20 20:57:29 UTC

[openoffice] branch AOO42X updated (8b614d9170 -> c6bea9faf3)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from 8b614d9170 Detect some endless loops
     new fb88d9ae73 Updating LICENSE for zlib 1.2.13
     new c6bea9faf3 Small adjustment

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/LICENSE | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


[openoffice] 02/02: Small adjustment

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit c6bea9faf3ad358c9a3a90f82697e61490273097
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Jan 20 21:55:52 2023 +0100

    Small adjustment
    
    (cherry picked from commit a0f0f82a8382b8aee2a818def55d0c58f703e68f)
---
 main/LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/LICENSE b/main/LICENSE
index 7cd91999a5..d5ef4db470 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -1932,7 +1932,7 @@ ____
 For ZLIB DATA COMPRESSION LIBRARY - built in main/zlib/:
 - zlib license
 
- (C) 1995-2022 Jean-loup Gailly and Mark Adler
+(C) 1995-2022 Jean-loup Gailly and Mark Adler
 
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages


[openoffice] 01/02: Updating LICENSE for zlib 1.2.13

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit fb88d9ae73b7dfe131f82063da48d27e4a493486
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Jan 20 21:52:01 2023 +0100

    Updating LICENSE for zlib 1.2.13
    
    (cherry picked from commit 2e9e6ff0ed701224730bbdce5942430ee8c0dc4b)
---
 main/LICENSE | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/LICENSE b/main/LICENSE
index 3d6821d365..7cd91999a5 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -1932,7 +1932,7 @@ ____
 For ZLIB DATA COMPRESSION LIBRARY - built in main/zlib/:
 - zlib license
 
-(C) 1995-2012 Jean-loup Gailly and Mark Adler
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@@ -1956,7 +1956,10 @@ For ZLIB DATA COMPRESSION LIBRARY - built in main/zlib/:
 If you use the zlib library in a product, we would appreciate *not* receiving
 lengthy legal documents to sign.  The sources are provided for free but without
 warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
+Gailly and Mark Adler; it does not include third-party code.  We make all
+contributions to and distributions of this project solely in our personal
+capacity, and are not conveying any rights to any intellectual property of
+any third parties.
 
 If you redistribute modified sources, we would appreciate that you include in
 the file ChangeLog history information documenting your changes.  Please read