Skip to content

Commit 0c02a75

Browse files
committed
Merge pull request #6627
88f856a [doc] Clarify authors in assets-attribution.md (MarcoFalke)
2 parents 3932ff5 + 88f856a commit 0c02a75

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

doc/assets-attribution.md

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,60 @@ The following is a list of assets used in the bitcoin source and their proper at
1111

1212
### Assets Used
1313
src/qt/res/icons/add.png
14-
src/qt/res/icons/address-book.png,
14+
src/qt/res/icons/address-book.png
1515
src/qt/res/icons/configure.png
1616
src/qt/res/icons/debugwindow.png
17-
src/qt/res/icons/edit.png,
18-
src/qt/res/icons/exitcopy.png
19-
src/qt/res/icons/editpaste.png,
17+
src/qt/res/icons/edit.png
18+
src/qt/res/icons/editcopy.png
19+
src/qt/res/icons/editpaste.png
2020
src/qt/res/icons/export.png
21-
src/qt/res/icons/eye.png,
21+
src/qt/res/icons/eye.png
2222
src/qt/res/icons/filesave.png
23-
src/qt/res/icons/history.png,
23+
src/qt/res/icons/history.png
2424
src/qt/res/icons/info.png
25-
src/qt/res/icons/key.png,
25+
src/qt/res/icons/key.png
2626
src/qt/res/icons/lock_*.png
27-
src/qt/res/icons/open.png,
27+
src/qt/res/icons/open.png
2828
src/qt/res/icons/overview.png
29-
src/qt/res/icons/quit.png,
29+
src/qt/res/icons/quit.png
3030
src/qt/res/icons/receive.png
31-
src/qt/res/icons/remove.png,
31+
src/qt/res/icons/remove.png
3232
src/qt/res/icons/send.png
33-
src/qt/res/icons/synced.png,
33+
src/qt/res/icons/synced.png
3434
src/qt/res/icons/transaction*.png
35-
src/qt/res/icons/tx_output.png,
35+
src/qt/res/icons/tx_output.png
3636
src/qt/res/icons/warning.png
3737

3838
Other
3939
-----------------------
4040

4141
### Info
4242
* Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke
43-
* Bitcoin Icon: Based on the original bitcoin logo from Bitboy
44-
* Network connection icon: Inspired by flow-merge.svg from Stephen Hutchings
45-
* Some icons are based on Stephan Hutchings Typicons
43+
* Bitcoin icon: Based on the original bitcoin logo from Bitboy
44+
* Network connection icons: Marco Falke, inspired by flow-merge.svg from Stephen Hutchings
45+
* Transaction-mined icon: Jonas Schnelli
46+
* Other icons are based on Stephan Hutchings Typicons
4647
* License: MIT
4748

4849
### Assets Used
4950
src/qt/res/icons/about.png
50-
src/qt/res/icons/about_qt.png,
51+
src/qt/res/icons/about_qt.png
5152
src/qt/res/icons/bitcoin.icns
52-
src/qt/res/icons/bitcoin.ico,
53+
src/qt/res/icons/bitcoin.ico
5354
src/qt/res/icons/bitcoin.png
54-
src/qt/res/icons/clock*.png,
55+
src/qt/res/icons/clock*.png
5556
src/qt/res/icons/connect*.png
56-
src/qt/res/icons/eye_minus.png,
57+
src/qt/res/icons/eye_minus.png
5758
src/qt/res/icons/eye_plus.png
58-
src/qt/res/icons/verify.png,
59+
src/qt/res/icons/verify.png
5960
src/qt/res/icons/tx_inout.png
60-
src/qt/res/icons/tx_input.png,
61-
src/qt/res/src/bitcoin.svg,
62-
src/qt/res/src/clock*.svg
63-
src/qt/res/src/connect*.svg,
61+
src/qt/res/icons/tx_input.png
62+
src/qt/res/icons/tx_mined.png
63+
src/qt/res/src/bitcoin.svg
64+
src/qt/res/src/clock_*.svg
65+
src/qt/res/src/connect-*.svg
6466
src/qt/res/src/mine.svg
6567
src/qt/res/src/qt.svg
66-
src/qt/res/src/tx*.svg,
68+
src/qt/res/src/tx_*.svg
69+
src/qt/res/src/transaction0.svg
6770
src/qt/res/src/verify.svg

0 commit comments

Comments
 (0)