diff options
| author | Luke Dashjr <[email protected]> | 2012-10-09 23:16:24 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-10-09 23:16:24 +0000 |
| commit | cef36fad891fba0fd8f5aec73bb17135b7fb133a (patch) | |
| tree | 43eeae2dd9003ae894603bbb315ee2c3e40b9097 /src/test/data/base58_encode_decode.json | |
| parent | When encrypting the wallet, warn user that old backups will become useless. (diff) | |
| parent | Avoid crashes at shutdown due to printf() in global destructors. (diff) | |
| download | discoin-cef36fad891fba0fd8f5aec73bb17135b7fb133a.tar.xz discoin-cef36fad891fba0fd8f5aec73bb17135b7fb133a.zip | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/bitcoinrpc.cpp
src/init.cpp
Diffstat (limited to 'src/test/data/base58_encode_decode.json')
0 files changed, 0 insertions, 0 deletions