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/NOTICE | |
| 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/NOTICE')
| -rw-r--r-- | readlicense_oo/license/NOTICE | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE index fd63ab4bf029..be31ed40efe9 100644 --- a/readlicense_oo/license/NOTICE +++ b/readlicense_oo/license/NOTICE @@ -137,10 +137,11 @@ http://www.eclipse.org/. ____ -As part of the base system this product also includes code from the following +As part of the base system this product may also includes code from the following projects which are licensed under the Apache license: - serf - redland +- Apache BeanShell Scripting for Java The notices from these projects are following: @@ -148,12 +149,15 @@ serf This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - redland This product includes Redland software (http://librdf.org/) developed at the Institute for Learning and Research Technology, University of Bristol, UK (http://www.bristol.ac.uk/). +Apache BeanShell Scripting for Java +Copyright 1997-2012 Patrick Niemeyer +Granted to the Apache Software Foundation 2012 +Licensed under the Apache License, Version 2.0. ____ This product includes software developed by the OpenSSL Project |