diff options
| author | Luke Dashjr <[email protected]> | 2012-09-11 01:18:43 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-09-11 01:32:18 +0000 |
| commit | be2e2845ec0844d42008287842bb053aabe58b0b (patch) | |
| tree | 0a535adaaeea7765acb781cd056ee25118ffd2f3 /src/test/data/base58_encode_decode.json | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| parent | Update supported translations (diff) | |
| download | discoin-be2e2845ec0844d42008287842bb053aabe58b0b.tar.xz discoin-be2e2845ec0844d42008287842bb053aabe58b0b.zip | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_zh_CN.ts
Diffstat (limited to 'src/test/data/base58_encode_decode.json')
0 files changed, 0 insertions, 0 deletions