From 25375ee8191c7f7d17feac879d8cde0d0351b2c4 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Mon, 13 Mar 2017 20:28:56 -0600 Subject: [PATCH] Update licenses. --- LICENSE-MIT | 2 +- README.md | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/LICENSE-MIT b/LICENSE-MIT index 6415849..87ffbb3 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Sean Bowe +Copyright (c) 2015-2016 Sean Bowe Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a08d8cf..c45766f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,19 @@ # bellman [![Build status](https://api.travis-ci.org/ebfull/bellman.svg)](https://travis-ci.org/ebfull/bellman) [![Crates.io](https://img.shields.io/crates/v/bellman.svg)](https://crates.io/crates/bellman) # This is a research project being built for [Zcash](https://z.cash/). + +## License + +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.