From 838d7d18dbe2f6d9e7c00ce17cb1967ee4101036 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 4 Jan 2022 17:07:42 +0000 Subject: [PATCH 1/2] Revert a change made in #53, so that the license and contribution preamble is visible in `README.md`. Addresses https://github.com/zcash-hackworks/zcash-test-vectors/pull/53/files#r751745511 --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2df4ef1..b8a2ea6 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,16 @@ Requirements: ## License -This repository is [MIT/Apache 2.0 dual-licensed](COPYING.md). +Licensed under either of + + * 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 the work by you, as defined in the Apache-2.0 +license, shall be dual licensed as above, without any additional terms or +conditions. From 2bff061a7bfdc2ba302d10c53eb1286d424496f9 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 4 Jan 2022 19:28:39 +0000 Subject: [PATCH 2/2] Update copyright year in LICENSE-MIT. Signed-off-by: Daira Hopwood --- LICENSE-MIT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE-MIT b/LICENSE-MIT index c4cda48..a972267 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018-2019 Electric Coin Company +Copyright (c) 2018-2021 The Electric Coin Company Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal