Skip to content

Commit

Permalink
[doc] Merge doc/assets-attribution.md into contrib/debian/copyright
Browse files Browse the repository at this point in the history
Even though the SVG source files are never used in the QT client,
their authors are mentioned in contrib/debian/copyright due to
simplicity.
  • Loading branch information
MarcoFalke committed Sep 18, 2015
1 parent 9be08b7 commit 2eb3183
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 72 deletions.
10 changes: 8 additions & 2 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@ License: MIT/Expat
Comment: Site: https://github.com/stephenhutchings/typicons.font

Files: src/qt/res/icons/connect*.png
src/qt/res/src/connect-*.svg
Copyright: Marco Falke
License: MIT/Expat
Comment: Inspired by Stephan Hutchings Typicons

Files: src/qt/res/icons/tx_mined.png
src/qt/res/src/mine.svg
Copyright: Jonas Schnelli
License: MIT/Expat
Comment:
Expand All @@ -62,13 +64,17 @@ Files: src/qt/res/icons/clock*.png
src/qt/res/icons/eye_*.png
src/qt/res/icons/verify.png
src/qt/res/icons/tx_in*.png
src/qt/res/src/clock_*.svg
src/qt/res/src/tx_*.svg
src/qt/res/src/verify.svg
Copyright: Stephan Hutching, Jonas Schnelli
License: MIT/Expat
Comment: Modifications of Stephan Hutchings Typicons

Files: src/qt/res/icons/bitcoin.*
src/qt/res/icons/about.png
Files: src/qt/res/icons/about.png
src/qt/res/icons/bitcoin.*
share/pixmaps/bitcoin*
src/qt/res/src/bitcoin.svg
Copyright: Bitboy, Jonas Schnelli
License: PUB-DOM
Comment: Site: https://bitcointalk.org/?topic=1756.0
Expand Down
71 changes: 1 addition & 70 deletions doc/assets-attribution.md
Original file line number Diff line number Diff line change
@@ -1,70 +1 @@
The following is a list of assets used in the bitcoin source and their proper attribution.

[Typicons/Stephen Hutchings](http://typicons.com)
-----------------------

### Info
* Icon Pack: Typicons (http://typicons.com)
* Designer: Stephen Hutchings (and more)
* License: MIT
* Site: [https://github.com/stephenhutchings/typicons.font](https://github.com/stephenhutchings/typicons.font)

### Assets Used
src/qt/res/icons/add.png
src/qt/res/icons/address-book.png
src/qt/res/icons/configure.png
src/qt/res/icons/debugwindow.png
src/qt/res/icons/edit.png
src/qt/res/icons/editcopy.png
src/qt/res/icons/editpaste.png
src/qt/res/icons/export.png
src/qt/res/icons/eye.png
src/qt/res/icons/filesave.png
src/qt/res/icons/history.png
src/qt/res/icons/info.png
src/qt/res/icons/key.png
src/qt/res/icons/lock_*.png
src/qt/res/icons/open.png
src/qt/res/icons/overview.png
src/qt/res/icons/quit.png
src/qt/res/icons/receive.png
src/qt/res/icons/remove.png
src/qt/res/icons/send.png
src/qt/res/icons/synced.png
src/qt/res/icons/transaction*.png
src/qt/res/icons/tx_output.png
src/qt/res/icons/warning.png

Other
-----------------------

### Info
* Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke
* Bitcoin icon: Based on the original bitcoin logo from Bitboy
* Network connection icons: Marco Falke, inspired by flow-merge.svg from Stephen Hutchings
* Transaction-mined icon: Jonas Schnelli
* Other icons are based on Stephan Hutchings Typicons
* License: MIT

### Assets Used
src/qt/res/icons/about.png
src/qt/res/icons/about_qt.png
src/qt/res/icons/bitcoin.icns
src/qt/res/icons/bitcoin.ico
src/qt/res/icons/bitcoin.png
src/qt/res/icons/clock*.png
src/qt/res/icons/connect*.png
src/qt/res/icons/eye_minus.png
src/qt/res/icons/eye_plus.png
src/qt/res/icons/verify.png
src/qt/res/icons/tx_inout.png
src/qt/res/icons/tx_input.png
src/qt/res/icons/tx_mined.png
src/qt/res/src/bitcoin.svg
src/qt/res/src/clock_*.svg
src/qt/res/src/connect-*.svg
src/qt/res/src/mine.svg
src/qt/res/src/qt.svg
src/qt/res/src/tx_*.svg
src/qt/res/src/transaction0.svg
src/qt/res/src/verify.svg
The list of assets used in the bitcoin source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).

0 comments on commit 2eb3183

Please sign in to comment.