about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2018-10-06 19:29:01 -0700
committerManish Goregaokar <manishsmail@gmail.com>2018-10-06 19:29:01 -0700
commit492d6852e5bd04c1a8df74077a1e11d0e5baff2e (patch)
tree0a9310bcc061cdc9f585fde0d8bb6f9293d3ebed
parent1e0729d48a2c062042f9587bca8e9078bb8ef619 (diff)
downloadrust-492d6852e5bd04c1a8df74077a1e11d0e5baff2e.tar.gz
rust-492d6852e5bd04c1a8df74077a1e11d0e5baff2e.zip
Add license to README
-rw-r--r--COPYRIGHT2
-rw-r--r--README.md9
2 files changed, 8 insertions, 3 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index a7112226318..cb9970597a2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright 2018 The Rust Project Developers
+Copyright 2014-2018 The Rust Project Developers
 
 Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
diff --git a/README.md b/README.md
index e429454cf28..9dd41f6513c 100644
--- a/README.md
+++ b/README.md
@@ -149,5 +149,10 @@ If you do not want to include your lint levels in your code, you can globally en
 
 ## License
 
-Licensed under [MPL](https://www.mozilla.org/MPL/2.0/).
-If you're having issues with the license, let me know and I'll try to change it to something more permissive.
+Copyright 2014-2018 The Rust Project Developers
+
+Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+<LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+option. All files in the project carrying such notice may not be
+copied, modified, or distributed except according to those terms.