aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-11-23 03:53:36 +0800
committerGitHub <noreply@github.com>2018-11-23 03:53:36 +0800
commitc6b550bd53e9695be327e140ce09843a04bf27e0 (patch)
tree652ff9648a7e6d9a670bf5d09cb0af9638adc018
parent3e44115c69ec5b2e8451ebe6f74a25f83d39a9f0 (diff)
parent640e3ca5969cee1332489297ac2c2d7d9a1e770e (diff)
downloaddexon-solidity-c6b550bd53e9695be327e140ce09843a04bf27e0.tar.gz
dexon-solidity-c6b550bd53e9695be327e140ce09843a04bf27e0.tar.zst
dexon-solidity-c6b550bd53e9695be327e140ce09843a04bf27e0.zip
Merge pull request #5488 from lazaridiscom/patch-3
Mention third party licenses
-rw-r--r--README.md3
-rw-r--r--cmake/templates/license.h.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/README.md b/README.md
index 7a448e8c..c7065c09 100644
--- a/README.md
+++ b/README.md
@@ -62,5 +62,6 @@ if you want to help.
[@chriseth](https://github.com/chriseth)
## License
-Solidity is licensed under [GNU General Public License v3.0](https://github.com/ethereum/solidity/blob/develop/LICENSE.txt)
+Solidity is licensed under [GNU General Public License v3.0](LICENSE.txt)
+Some third-party code has its [own licensing terms](cmake/templates/license.h.in).
diff --git a/cmake/templates/license.h.in b/cmake/templates/license.h.in
index 4f22d8f4..31e2e17d 100644
--- a/cmake/templates/license.h.in
+++ b/cmake/templates/license.h.in
@@ -67,7 +67,7 @@ jsoncpp:
license you like.
scanner/token:
- The libsolidity/parsing/{scanner,token}.{h,cpp} files are dervied from
+ The liblangutil/{CharStream,Scanner,Token}.{h,cpp} files are dervied from
code originating from the V8 project licensed under the following terms:
Copyright 2006-2012, the V8 project authors. All rights reserved.