diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:40:25 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:40:25 +0000 |
| commit | 38297ba90a6447e524514b17d3ebf0b35ea6f7f2 (patch) | |
| tree | 104c4a07fca2a3753b8f72f53c7e3fafb6101b1e /src/qt/bitcoinstrings.cpp | |
| parent | 4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d (diff) | |
| parent | 6ec7ac15ff84080e7cfa65c860dd90b33d596ef2 (diff) | |
| download | bitcoin-38297ba90a6447e524514b17d3ebf0b35ea6f7f2.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
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 'src/qt/bitcoinstrings.cpp')
0 files changed, 0 insertions, 0 deletions