mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-21 15:50:07 +01:00
Conflicts: bitcoin-qt.pro contrib/gitian-descriptors/gitian-win32.yml doc/README doc/README_windows.txt share/qt/make_windows_icon.sh share/setup.nsi src/bitcoinrpc.cpp src/main.cpp src/main.h src/makefile.linux-mingw src/net.cpp src/net.h src/netbase.h src/noui.h src/qt/addressbookpage.cpp src/qt/bitcoin.cpp src/qt/bitcoingui.cpp src/qt/bitcoingui.h src/qt/bitcoinstrings.cpp src/qt/guiutil.cpp src/qt/guiutil.h src/qt/optionsmodel.cpp src/qt/qrcodedialog.cpp src/qt/qtipcserver.cpp src/script.cpp src/serialize.h src/ui_interface.h src/uint256.h