aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-09-03 17:01:10 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-09-03 17:03:46 +0200
commit0c02a75787fe14115c4283290c1d37fbf2bee67e (patch)
treecc7f6f0061af7d687f00ce706f5a0182511d51b4
parent3932ff50c563df19c14e9987f2297d9f99a299ac (diff)
parent88f856a9e78a1440d9fdd8f9d5aa3cd034d66bf9 (diff)
Merge pull request #6627
88f856a [doc] Clarify authors in assets-attribution.md (MarcoFalke)
-rw-r--r--doc/assets-attribution.md53
1 files changed, 28 insertions, 25 deletions
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md
index b5a033dd79..460c1f8e2e 100644
--- a/doc/assets-attribution.md
+++ b/doc/assets-attribution.md
@@ -11,28 +11,28 @@ The following is a list of assets used in the bitcoin source and their proper at
### Assets Used
src/qt/res/icons/add.png
- src/qt/res/icons/address-book.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/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/eye.png
src/qt/res/icons/filesave.png
- src/qt/res/icons/history.png,
+ src/qt/res/icons/history.png
src/qt/res/icons/info.png
- src/qt/res/icons/key.png,
+ src/qt/res/icons/key.png
src/qt/res/icons/lock_*.png
- src/qt/res/icons/open.png,
+ src/qt/res/icons/open.png
src/qt/res/icons/overview.png
- src/qt/res/icons/quit.png,
+ src/qt/res/icons/quit.png
src/qt/res/icons/receive.png
- src/qt/res/icons/remove.png,
+ src/qt/res/icons/remove.png
src/qt/res/icons/send.png
- src/qt/res/icons/synced.png,
+ src/qt/res/icons/synced.png
src/qt/res/icons/transaction*.png
- src/qt/res/icons/tx_output.png,
+ src/qt/res/icons/tx_output.png
src/qt/res/icons/warning.png
Other
@@ -40,28 +40,31 @@ Other
### Info
* 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
+* 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/about_qt.png
src/qt/res/icons/bitcoin.icns
- src/qt/res/icons/bitcoin.ico,
+ src/qt/res/icons/bitcoin.ico
src/qt/res/icons/bitcoin.png
- src/qt/res/icons/clock*.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_minus.png
src/qt/res/icons/eye_plus.png
- src/qt/res/icons/verify.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/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/tx_*.svg
+ src/qt/res/src/transaction0.svg
src/qt/res/src/verify.svg