diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-15 18:18:01 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-15 18:18:01 +0000 |
| commit | 747b688b54076c3b35cb37cae7c529f11a18a588 (patch) | |
| tree | 83657b1b987f0e80f5063edc4a3dd3be683cb4b2 /.gitignore | |
| parent | c87919696d529888420effe534fd6e2ed25e6d6b (diff) | |
| parent | f9d1d138557f6e19726a18f19a328e8866165d5a (diff) | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_zh_CN.ts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions