diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-28 07:31:01 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-28 07:31:01 +0000 |
| commit | 7181bda15dc05802aff0f899cfc86701bc80c8bc (patch) | |
| tree | 4ed0c30e0c252568b5c0c938eb99a3543513ec09 /README | |
| parent | 4c93f17e9ec7b9f4fda22ade34c5b9958948473b (diff) | |
| parent | d011dc270a1824b04a1a4cf513f3800379b525db (diff) | |
Tree-Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/bitcoinstrings.cpp
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_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions