Merge pull request #6369

dae0a89 assets-attribution: Update typicons to MIT license (Luke Dashjr)
This commit is contained in:
Wladimir J. van der Laan 2015-07-03 09:36:19 +02:00
commit 5bd26efbf6
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -6,7 +6,7 @@ The following is a list of assets used in the bitcoin source and their proper at
### Info
* Icon Pack: Typicons (http://typicons.com)
* Designer: Stephen Hutchings (and more)
* License: CC BY-SA
* License: MIT
* Site: [https://github.com/stephenhutchings/typicons.font](https://github.com/stephenhutchings/typicons.font)
### Assets Used
@ -30,7 +30,7 @@ Jonas Schnelli
### Info
* Designer: Jonas Schnelli
* Bitcoin Icon: (based on the original bitcoin logo from Bitboy)
* Some icons are based on Stephan Hutchings Typicons (these are under CC BY-SA license)
* Some icons are based on Stephan Hutchings Typicons
* License: MIT
### Assets Used