summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2010-06-02 14:04:52 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2010-06-02 14:04:52 +0000
commit3bff39ce7672ba918aa84a82568208aa5827464c (patch)
tree08bdf8847648ef621a34f5b3f77e5075e263fcad /docs
parent30d976734324531856a8c262bc3c5a62b00e25ca (diff)
downloadscala-3bff39ce7672ba918aa84a82568208aa5827464c.tar.gz
scala-3bff39ce7672ba918aa84a82568208aa5827464c.tar.bz2
scala-3bff39ce7672ba918aa84a82568208aa5827464c.zip
Added more license notices for things shipped w...
Added more license notices for things shipped with Scala.
Diffstat (limited to 'docs')
-rw-r--r--docs/licenses/apache_android.txt16
-rw-r--r--docs/licenses/bsd_jline.txt34
2 files changed, 50 insertions, 0 deletions
diff --git a/docs/licenses/apache_android.txt b/docs/licenses/apache_android.txt
new file mode 100644
index 0000000000..00f339625f
--- /dev/null
+++ b/docs/licenses/apache_android.txt
@@ -0,0 +1,16 @@
+Scala includes various example files for Android:
+
+Copyright (c) 2005-2009, The Android Open Source Project
+Copyright (c) 2007, Steven Osborn
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. \ No newline at end of file
diff --git a/docs/licenses/bsd_jline.txt b/docs/licenses/bsd_jline.txt
new file mode 100644
index 0000000000..4ac4a378ed
--- /dev/null
+++ b/docs/licenses/bsd_jline.txt
@@ -0,0 +1,34 @@
+Scala includes the jLine library:
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.