Skip to content

Commit 2eb3183

Browse files
author
MarcoFalke
committed
[doc] Merge doc/assets-attribution.md into contrib/debian/copyright
Even though the SVG source files are never used in the QT client, their authors are mentioned in contrib/debian/copyright due to simplicity.
1 parent 9be08b7 commit 2eb3183

File tree

2 files changed

+9
-72
lines changed

2 files changed

+9
-72
lines changed

contrib/debian/copyright

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ License: MIT/Expat
4949
Comment: Site: https://github.com/stephenhutchings/typicons.font
5050

5151
Files: src/qt/res/icons/connect*.png
52+
src/qt/res/src/connect-*.svg
5253
Copyright: Marco Falke
5354
License: MIT/Expat
5455
Comment: Inspired by Stephan Hutchings Typicons
5556

5657
Files: src/qt/res/icons/tx_mined.png
58+
src/qt/res/src/mine.svg
5759
Copyright: Jonas Schnelli
5860
License: MIT/Expat
5961
Comment:
@@ -62,13 +64,17 @@ Files: src/qt/res/icons/clock*.png
6264
src/qt/res/icons/eye_*.png
6365
src/qt/res/icons/verify.png
6466
src/qt/res/icons/tx_in*.png
67+
src/qt/res/src/clock_*.svg
68+
src/qt/res/src/tx_*.svg
69+
src/qt/res/src/verify.svg
6570
Copyright: Stephan Hutching, Jonas Schnelli
6671
License: MIT/Expat
6772
Comment: Modifications of Stephan Hutchings Typicons
6873

69-
Files: src/qt/res/icons/bitcoin.*
70-
src/qt/res/icons/about.png
74+
Files: src/qt/res/icons/about.png
75+
src/qt/res/icons/bitcoin.*
7176
share/pixmaps/bitcoin*
77+
src/qt/res/src/bitcoin.svg
7278
Copyright: Bitboy, Jonas Schnelli
7379
License: PUB-DOM
7480
Comment: Site: https://bitcointalk.org/?topic=1756.0

doc/assets-attribution.md

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1 @@
1-
The following is a list of assets used in the bitcoin source and their proper attribution.
2-
3-
[Typicons/Stephen Hutchings](http://typicons.com)
4-
-----------------------
5-
6-
### Info
7-
* Icon Pack: Typicons (http://typicons.com)
8-
* Designer: Stephen Hutchings (and more)
9-
* License: MIT
10-
* Site: [https://github.com/stephenhutchings/typicons.font](https://github.com/stephenhutchings/typicons.font)
11-
12-
### Assets Used
13-
src/qt/res/icons/add.png
14-
src/qt/res/icons/address-book.png
15-
src/qt/res/icons/configure.png
16-
src/qt/res/icons/debugwindow.png
17-
src/qt/res/icons/edit.png
18-
src/qt/res/icons/editcopy.png
19-
src/qt/res/icons/editpaste.png
20-
src/qt/res/icons/export.png
21-
src/qt/res/icons/eye.png
22-
src/qt/res/icons/filesave.png
23-
src/qt/res/icons/history.png
24-
src/qt/res/icons/info.png
25-
src/qt/res/icons/key.png
26-
src/qt/res/icons/lock_*.png
27-
src/qt/res/icons/open.png
28-
src/qt/res/icons/overview.png
29-
src/qt/res/icons/quit.png
30-
src/qt/res/icons/receive.png
31-
src/qt/res/icons/remove.png
32-
src/qt/res/icons/send.png
33-
src/qt/res/icons/synced.png
34-
src/qt/res/icons/transaction*.png
35-
src/qt/res/icons/tx_output.png
36-
src/qt/res/icons/warning.png
37-
38-
Other
39-
-----------------------
40-
41-
### Info
42-
* Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke
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
47-
* License: MIT
48-
49-
### Assets Used
50-
src/qt/res/icons/about.png
51-
src/qt/res/icons/about_qt.png
52-
src/qt/res/icons/bitcoin.icns
53-
src/qt/res/icons/bitcoin.ico
54-
src/qt/res/icons/bitcoin.png
55-
src/qt/res/icons/clock*.png
56-
src/qt/res/icons/connect*.png
57-
src/qt/res/icons/eye_minus.png
58-
src/qt/res/icons/eye_plus.png
59-
src/qt/res/icons/verify.png
60-
src/qt/res/icons/tx_inout.png
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
66-
src/qt/res/src/mine.svg
67-
src/qt/res/src/qt.svg
68-
src/qt/res/src/tx_*.svg
69-
src/qt/res/src/transaction0.svg
70-
src/qt/res/src/verify.svg
1+
The list of assets used in the bitcoin source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).

0 commit comments

Comments
 (0)