diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-10-18 17:02:45 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-10-18 17:13:45 -0700 |
| commit | ec960ad03f16b4f614d3cab40324ccae0bd1c36d (patch) | |
| tree | f82b7e76ff73ea97b6ad5e4d6e1c03a446ed3939 /doc | |
| parent | 7ef557539ddf9cdc0959a374f95254eda21731e7 (diff) | |
| download | scala-ec960ad03f16b4f614d3cab40324ccae0bd1c36d.tar.gz scala-ec960ad03f16b4f614d3cab40324ccae0bd1c36d.tar.bz2 scala-ec960ad03f16b4f614d3cab40324ccae0bd1c36d.zip | |
Duplicate license in /LICENSE for GitHub
So that our license (in doc/LICENSE.md) is detected by `licensee`.
Also removed some cruft while I was at it... Bye bye svn mappings.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/README b/doc/README index 29f64c9fef..a89ab52792 100644 --- a/doc/README +++ b/doc/README @@ -1,7 +1,7 @@ Scala Distribution ------------------ -The Scala distribution requires Java 1.6 or above. +The Scala distribution requires Java 1.8 or above. Please report bugs at https://issues.scala-lang.org/. We welcome contributions at https://github.com/scala/scala! @@ -31,6 +31,6 @@ Licenses -------- Scala is licensed under the standard 3-clause BSD license, -included in the distribution as the file `doc/LICENSE`. +included in the distribution as the file `doc/LICENSE.md`. The licenses of the software included in the Scala distribution can be found in the `doc/licenses` directory.
\ No newline at end of file |