bitcoin

mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-21 20:28:59 +02:00

Files

Luke Dashjr 1376cd9d7f Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	bitcoin-qt.pro
	contrib/debian/changelog
	doc/README
	doc/README_windows.txt
	doc/translation_process.md
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/db.cpp
	src/init.cpp
	src/irc.cpp
	src/main.cpp
	src/main.h
	src/makefile.osx
	src/makefile.unix
	src/net.cpp
	src/net.h
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	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
	src/qt/sendcoinsdialog.h
	src/qt/transactionrecord.cpp
	src/script.cpp
	src/script.h
	src/serialize.h
	src/util.cpp
	src/util.h

2012-04-04 10:32:09 -04:00

bitrpc

Added bitrpc.py which allows for sending of all standard Bitcoin commands via RPC rather than as command line args.

2011-10-03 16:10:03 -07:00

debian

Merge pull request #834 from sje397/BackupWallet

2012-02-17 10:30:15 -08:00

gitian-descriptors

Merge branch '0.5.x' into 0.6.0.x

2012-04-04 10:32:09 -04:00

gitian-downloader

Add laanwj to gitian download scripts.