diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:14:59 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:14:59 +0000 |
| commit | f08ad34e0c7879d60d854c7014cc788e4268889f (patch) | |
| tree | 4d101e8f8ba21a29026d3992abda8f2348c1c707 /src/qt/locale/bitcoin_zh_CN.ts | |
| parent | 802bc904ba102c19631aa2aad9659df74fe0e07e (diff) | |
| parent | d31e24aeaaf18a4117f23a937614a8bf2679e8a4 (diff) | |
| download | bitcoin-f08ad34e0c7879d60d854c7014cc788e4268889f.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
Diffstat (limited to 'src/qt/locale/bitcoin_zh_CN.ts')
0 files changed, 0 insertions, 0 deletions