diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 16:08:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 16:42:44 +0200 |
| commit | d4211176208b5e4ae4a699c6ce3239447752cdb2 (patch) | |
| tree | 2f1c91d534d1571e3a04c000d66590964bbc213e /share/pixmaps | |
| parent | a24b23622e504f5134dd8011af5bbe68cb9443f1 (diff) | |
| parent | 5b0fc31b1c3d25039262ae2043474b35c14bd30b (diff) | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'share/pixmaps')
| -rw-r--r-- | share/pixmaps/bitcoin.ico | bin | 25782 -> 93256 bytes |
| -rw-r--r-- | share/pixmaps/nsis-header.bmp | bin | 0 -> 25818 bytes |
| -rw-r--r-- | share/pixmaps/nsis-wizard.bmp | bin | 0 -> 154542 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico Binary files differindex cdec9a037b..734d21701e 100644 --- a/share/pixmaps/bitcoin.ico +++ b/share/pixmaps/bitcoin.ico diff --git a/share/pixmaps/nsis-header.bmp b/share/pixmaps/nsis-header.bmp Binary files differnew file mode 100644 index 0000000000..9ab0ce2591 --- /dev/null +++ b/share/pixmaps/nsis-header.bmp diff --git a/share/pixmaps/nsis-wizard.bmp b/share/pixmaps/nsis-wizard.bmp Binary files differnew file mode 100644 index 0000000000..71255c6850 --- /dev/null +++ b/share/pixmaps/nsis-wizard.bmp |
