diff options
| author | Luke Dashjr <[email protected]> | 2012-10-15 18:23:33 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-10-15 18:23:33 +0000 |
| commit | 37be168579a9ad1b94d73bc383ba003fe4dbca2d (patch) | |
| tree | 2b9b1135d0e656f174df8eb4310cf4567b6c7f50 /src/test/data/base58_encode_decode.json | |
| parent | Merge branch '0.6.0.x' into 0.6.x (diff) | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| download | discoin-37be168579a9ad1b94d73bc383ba003fe4dbca2d.tar.xz discoin-37be168579a9ad1b94d73bc383ba003fe4dbca2d.zip | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/qt/locale/bitcoin_cs.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_ru.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