aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-08-07 12:56:38 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-08-07 12:57:17 +0200
commit100c9d3994efa0527915bf15d6cc3078d6b80856 (patch)
treef3dc5ba8131a647569bd934d44aa8ac62cf8dbc0 /doc
parente545371b77d419b3bf4dd194b3f3c107d9bce6d1 (diff)
parentdf9c2ee1c9c02b79ccbb6cbae03096c3f9af23c7 (diff)
downloadbitcoin-100c9d3994efa0527915bf15d6cc3078d6b80856.tar.xz
Merge pull request #6505
df9c2ee [Qt] replace wifi icon with network symbol (Marco) 9142867 [QT] cleanup icons (Marco)
Diffstat (limited to 'doc')
-rw-r--r--doc/assets-attribution.md71
1 files changed, 46 insertions, 25 deletions
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md
index c6da1a4586..b5a033dd79 100644
--- a/doc/assets-attribution.md
+++ b/doc/assets-attribution.md
@@ -10,37 +10,58 @@ The following is a list of assets used in the bitcoin source and their proper at
* 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/connect4.png,
- src/qt/res/icons/debugwindow.png, src/qt/res/icons/edit.png,
- src/qt/res/icons/exitcopy.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/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/exitcopy.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
-Jonas Schnelli
+Other
-----------------------
### Info
-* Designer: Jonas Schnelli
-* Bitcoin Icon: (based on the original bitcoin logo from Bitboy)
+* Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke
+* Bitcoin Icon: Based on the original bitcoin logo from Bitboy
+* Network connection icon: Inspired by flow-merge.svg from Stephen Hutchings
* Some 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[0-3].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/src/verify.svg, 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/verify.svg,
+ 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/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/verify.svg