summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-08-28 13:53:46 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-08-28 13:53:46 -0700
commit86f42093ff149831fc5c5615032e907d2988a903 (patch)
treec0c372804449621b1756cb229a73f25b52f33782
parent8e07873b7b9e407add2961d35a15e3d4b704a413 (diff)
downloadscala-86f42093ff149831fc5c5615032e907d2988a903.tar.gz
scala-86f42093ff149831fc5c5615032e907d2988a903.tar.bz2
scala-86f42093ff149831fc5c5615032e907d2988a903.zip
Note about license cleanup
-rw-r--r--2.11/index.markdown4
1 files changed, 4 insertions, 0 deletions
diff --git a/2.11/index.markdown b/2.11/index.markdown
index 38a7674c18..a85dcfc4b7 100644
--- a/2.11/index.markdown
+++ b/2.11/index.markdown
@@ -7,6 +7,10 @@ The current 2.11 milestone is [M4](https://github.com/scala/scala/releases/tag/v
To contribute to this overview, [please submit a pull request](https://github.com/scala/scala/tree/gh-pages/2.11/index.markdown).
+Important note: Scala is now distributed under the standard 3-clause BSD license.
+Originally, the same 3-clause BSD license was adopted, but slightly reworded over the years.
+We're now back to the standard formulation.
+
# Smaller
We're modularizing the standard library and the compiler to allow more selective use of Scala's features, and to facilitate contributions to more clearly delineated sub-projects.