diff options
| author | Luke Dashjr <[email protected]> | 2012-10-20 23:28:14 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-10-20 23:28:14 +0000 |
| commit | f9459ef91470563ee46279599135baad80470c4d (patch) | |
| tree | 1199f1a4c064dc9d0fc1206dfda901674f4d1d0b /src/init.cpp | |
| parent | Tree-Merge branch '0.6.x' into 0.7.x (diff) | |
| parent | Merge branch '0.6.0.x' into 0.6.x (diff) | |
| download | discoin-f9459ef91470563ee46279599135baad80470c4d.tar.xz discoin-f9459ef91470563ee46279599135baad80470c4d.zip | |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/bitcoinrpc.cpp
src/qt/bitcoinstrings.cpp
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_cs.ts
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_et.ts
src/qt/locale/bitcoin_eu_ES.ts
src/qt/locale/bitcoin_fa.ts
src/qt/locale/bitcoin_fa_IR.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_CA.ts
src/qt/locale/bitcoin_fr_FR.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hr.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_tr.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
Diffstat (limited to 'src/init.cpp')
0 files changed, 0 insertions, 0 deletions