diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-22 10:23:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-22 09:26:18 +0000 |
| commit | d3b6728dcca6a564d073e5610323d9fab122c81c (patch) | |
| tree | bf55fa3566cd77128b24e96dd5283d3253c52f96 /readlicense_oo/license/LICENSE | |
| parent | d7d7298b03d30357e314fba7177d2831b8a56340 (diff) | |
bsh-2.0b5 is under the APL, adjust readlicense_oo and include notice
edit fodt first with writer, and export to xhtml for the html
(adjusted the .txt file manually)
Change-Id: I94c7e42df2c4de3f511c3ca293c3ae934807e06f
Reviewed-on: https://gerrit.libreoffice.org/15854
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'readlicense_oo/license/LICENSE')
| -rw-r--r-- | readlicense_oo/license/LICENSE | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE index 862d5c9d76ff..a01c59d2200a 100644 --- a/readlicense_oo/license/LICENSE +++ b/readlicense_oo/license/LICENSE @@ -79,36 +79,7 @@ beanshell The following software may be included in this product: beanshell. Use of any of this software is governed by the terms of the license below: - This file is part of the BeanShell Java Scripting distribution. - Documentation and updates may be found at http://www.beanshell.org/ - - Sun Public License Notice: - - The contents of this file are subject to the Sun Public License Version - 1.0 (the "License"); you may not use this file except in compliance - with the License. A copy of the License is available at - http://www.sun.com - - The Original Code is BeanShell. The Initial Developer of the Original - Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright - (C) 2000. All Rights Reserved. - - GNU Public License Notice: - - Alternatively, the contents of this file may be used under the terms of - the GNU Lesser General Public License (the "LGPL"), in which case the - provisions of LGPL are applicable instead of those above. If you wish - to allow use of your version of this file only under the terms of the - LGPL and not to allow others to use your version of this file under the - SPL, indicate your decision by deleting the provisions above and - replace them with the notice and other provisions required by the LGPL. - If you do not delete the provisions above, a recipient may use your - version of this file under either the SPL or the LGPL. - - Patrick Niemeyer (pat@pat.net) Author of Learning Java, O'Reilly & - Associates http://www.pat.net/~pat/ - - See LGPL Version 3 below + See Apache License Version 2.0 below C++ Boost Library |