diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:10:41 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:10:41 +0000 |
| commit | d31e24aeaaf18a4117f23a937614a8bf2679e8a4 (patch) | |
| tree | 30852ed3e4aa86d63deef2c47d9090866381dcfa /src/qt/locale/bitcoin_zh_CN.ts | |
| parent | e1c2163fb7b3f37932be9093cadd6cce250844a5 (diff) | |
| parent | b9b15578bb52a7a7394fd1ef497f186c5c950cb1 (diff) | |
| download | bitcoin-d31e24aeaaf18a4117f23a937614a8bf2679e8a4.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
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