summaryrefslogtreecommitdiff
path: root/docs/LICENSE
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 10:07:09 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 10:07:09 -0800
commit1e530365fd3a1ab749091e7c56850405dc98aed1 (patch)
treee98e6e16c5f6fd003ef4c6581fa8a97f215ccfed /docs/LICENSE
parentd614965f083981817bfa08b84a07c069987d0a78 (diff)
parent3bfd83971ec48102fd1e711236f5a313c6a1ce3e (diff)
downloadscala-1e530365fd3a1ab749091e7c56850405dc98aed1.tar.gz
scala-1e530365fd3a1ab749091e7c56850405dc98aed1.tar.bz2
scala-1e530365fd3a1ab749091e7c56850405dc98aed1.zip
Merge pull request #3265 from retronym/merge/2.10.x-to-master
Merge 2.10.x to master
Diffstat (limited to 'docs/LICENSE')
-rw-r--r--docs/LICENSE36
1 files changed, 36 insertions, 0 deletions
diff --git a/docs/LICENSE b/docs/LICENSE
index 446a1a350b..4daedef581 100644
--- a/docs/LICENSE
+++ b/docs/LICENSE
@@ -1,5 +1,11 @@
+Scala is licensed under the [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause).
+
+## Scala License
+
Copyright (c) 2002-2013 EPFL
+Copyright (c) 2011-2013 Typesafe, Inc.
+
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -25,3 +31,33 @@ 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.
+
+# Other Licenses
+
+This software includes projects with the following licenses,
+which are also included in the `licenses/` directory:
+
+### [Apache License](http://www.apache.org/licenses/LICENSE-2.0.html)
+This license is used by the following third-party libraries:
+ * jansi
+
+### [BSD License](http://www.opensource.org/licenses/bsd-license.php)
+This license is used by the following third-party libraries:
+ * jline
+
+### [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
+This license is used by the following third-party libraries:
+ * asm
+
+### [MIT License](http://www.opensource.org/licenses/MIT)
+This license is used by the following third-party libraries:
+ * jquery
+ * jquery-ui
+ * jquery-layout
+ * sizzle
+ * tools tooltip
+
+### Public Domain
+The following libraries are freely available in the public domain:
+ * forkjoin
+