diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-06 16:34:34 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-06 16:34:34 -0400 |
| commit | 892fcaf291cb9fc0f9efd4244f01b6b6529409ba (patch) | |
| tree | 652c768a2961fc49988a6e7c1418841c05e8faaf /doc | |
| parent | 0d10cb7a1f6314760ef8895490e5c1042c3549b1 (diff) | |
| parent | bf1f995c4c968f4325ac05474fcfd87924d62e36 (diff) | |
| download | bitcoin-892fcaf291cb9fc0f9efd4244f01b6b6529409ba.tar.xz | |
Merge branch '0.5.0.x' into 0.5.x
Conflicts:
src/qt/notificator.h
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/assets-attribution.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 5cf0a734bf..2ed25bbe9e 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -1,3 +1,7 @@ +Code: src/strlcpy.h +Author: Todd C. Miller <Todd.Miller@courtesan.com> +License: ISC + Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, src/qt/res/src/*.svg Designer: Wladimir van der Laan |