aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-09-21 18:17:39 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-09-21 18:17:48 +0200
commit229fb974ab0d1707546cd566a2f8001555c3eeab (patch)
tree2699a51cf3e0e52c1689e4688bbc2fecab95f30b /doc
parent10fc4fb36894c2afecf030ba40056186538dcf0f (diff)
parent2eb3183ca495c08212ff425b264b261428f278f0 (diff)
downloadbitcoin-229fb974ab0d1707546cd566a2f8001555c3eeab.tar.xz
Merge pull request #6667
2eb3183 [doc] Merge doc/assets-attribution.md into contrib/debian/copyright (MarcoFalke) 9be08b7 Update contrib/debian/copyright (MarcoFalke)
Diffstat (limited to 'doc')
-rw-r--r--doc/assets-attribution.md71
1 files changed, 1 insertions, 70 deletions
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md
index 460c1f8e2e..2dd930d6a4 100644
--- a/doc/assets-attribution.md
+++ b/doc/assets-attribution.md
@@ -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).