Mercurial > hg > bitcoin

changeset 2998:e0269e2f757e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch '0.5.x' into 0.6.0.x Conflicts: src/main.cpp 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
author Luke Dashjr <luke-jr+git@utopios.org>
date Mon, 07 May 2012 04:10:54 +0000
parents 56be19ae00ed (current diff) f59c34abfbfa (diff)
children 78df73f87130
files src/main.cpp 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 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff