diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:15:48 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:15:48 -0400 |
| commit | 3374c3ef094b328e6c6957fdaf5a9abff0c53a33 (patch) | |
| tree | 2c31367efc456d8a77d235be53612190e184b554 /doc | |
| parent | 1bdfa94a0164f73b453633861b91c67bb6bf10d8 (diff) | |
| parent | e73b792b1af9d9d747bac81a27d16020ed393905 (diff) | |
| download | bitcoin-3374c3ef094b328e6c6957fdaf5a9abff0c53a33.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/sendcoinsdialog.cpp
src/qt/sendcoinsdialog.h
src/util.cpp
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 fabcdeea76..0b0e377065 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 |