New upstream version 1.23.0+dfsg1

[rustc.git] / src / vendor / backtrace / README.md

diff --git a/src/vendor/backtrace/README.md b/src/vendor/backtrace/README.md
index 1c96cd2326bb0020ba3aca0fcd68656180f5a415..f887f8c2c30e47a8a37eae5954772c9ea5edf353 100644 (file)
--- a/src/vendor/backtrace/README.md
+++ b/src/vendor/backtrace/README.md
@@ -73,10 +73,19 @@ fn main() {
 This library currently supports OSX, Linux, and Windows. Support for other
 platforms is always welcome!
 
-## License
+# License
 
-`backtrace-rs` is primarily distributed under the terms of both the MIT license
-and the Apache License (Version 2.0), with portions covered by various BSD-like
-licenses.
+This project is licensed under either of
 
-See LICENSE-APACHE, and LICENSE-MIT for details.
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in backtrace-rs by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.