diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:45:19 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:45:19 +0000 |
| commit | 5dc6be8bba5853a0588c6e46fa0c2a97b0096196 (patch) | |
| tree | 4faf61d32e0d22a3df068d634615b1ecbf071b2f /.gitattributes | |
| parent | 32419357747f9c13c9d934d50f7974387419c0ce (diff) | |
| parent | 38297ba90a6447e524514b17d3ebf0b35ea6f7f2 (diff) | |
| download | bitcoin-5dc6be8bba5853a0588c6e46fa0c2a97b0096196.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_cs.ts
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_et.ts
src/qt/locale/bitcoin_eu_ES.ts
src/qt/locale/bitcoin_fa.ts
src/qt/locale/bitcoin_fa_IR.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_CA.ts
src/qt/locale/bitcoin_fr_FR.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hr.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_tr.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions