mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-21 07:39:08 +01:00
8a17087795
Conflicts: bitcoin-qt.pro contrib/debian/patches/1001_use_system_json-spirit.patch doc/README doc/README_windows.txt doc/build-osx.txt doc/build-unix.txt doc/readme-qt.rst share/setup.nsi src/addrman.cpp src/bitcoinrpc.cpp src/checkpoints.cpp src/crypter.cpp src/db.cpp src/db.h src/init.cpp src/init.h src/irc.cpp src/key.cpp src/key.h src/main.cpp src/main.h src/makefile.linux-mingw src/makefile.mingw src/makefile.unix src/net.cpp src/net.h src/qt/addressbookpage.cpp src/qt/bitcoin.cpp src/qt/bitcoinaddressvalidator.cpp src/qt/bitcoingui.cpp src/qt/bitcoinstrings.cpp src/qt/forms/overviewpage.ui 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 src/qt/optionsdialog.cpp src/qt/optionsmodel.h src/qt/overviewpage.cpp src/qt/overviewpage.h src/qt/sendcoinsdialog.cpp src/qt/transactiondesc.cpp src/qt/transactiontablemodel.h src/qt/walletmodel.cpp src/script.cpp src/test/DoS_tests.cpp src/util.cpp src/util.h src/version.h src/walletdb.cpp