diff options
| author | Jeff Garzik <jeff@garzik.org> | 2011-05-09 14:00:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-09 14:00:14 -0400 |
| commit | b17be7e14b4a62b7935c75fe7e7645e736fd68d2 (patch) | |
| tree | be44c7310683df72aeb5781ec74a85451206cfbc /share/pixmaps/bitcoin.ico | |
| parent | c0430f42b868dbf996a416d3a9d81d1c8c07e47c (diff) | |
| parent | 84c3fb07b0b8199c7f85c5de280e7100bad0786f (diff) | |
Manual merge of jaromil's source tree reorg commit.
Conflicts:
src/sha256.cpp
Diffstat (limited to 'share/pixmaps/bitcoin.ico')
| -rw-r--r-- | share/pixmaps/bitcoin.ico | bin | 0 -> 25782 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico Binary files differnew file mode 100644 index 0000000000..cdec9a037b --- /dev/null +++ b/share/pixmaps/bitcoin.ico |