Merge branch 'bip-biprevised' of github.com:luke-jr/bips into bip-biprevised

This commit is contained in:
Luke Dashjr 2016-02-04 04:13:13 +00:00
commit 5fb9d90d2d

View File

@ -135,7 +135,7 @@ New BIPs may be accepted with the following licenses:
In addition, it is recommended that literal code included in the BIP be dual-licensed under the same license terms as the project it modifies. For example, literal code intended for Bitcoin Core would ideally be dual-licensed under the MIT license terms as well as one of the above with the rest of the BIP text.
====Not recommented, but acceptable licenses====
====Not recommended, but acceptable licenses====
* [http://www.apache.org/licenses/LICENSE-2.0 Apache License, version 2.0]
* [http://www.boost.org/LICENSE_1_0.txt Boost Software License, version 1.0]