diff options
| author | Luke Dashjr <[email protected]> | 2012-09-11 01:33:05 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-09-11 01:35:36 +0000 |
| commit | 6047902934c452ae318697af688b8fb0e09a58ff (patch) | |
| tree | 679c57f31a3e4bdb652b7e294b0716dba0d015b3 /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-6047902934c452ae318697af688b8fb0e09a58ff.tar.xz discoin-6047902934c452ae318697af688b8fb0e09a58ff.zip | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_CA.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_uk.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