Jimmy Kiselak e08d765f11 Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge ... Conflicts: Makefile.am README.md configure.ac contrib/seeds/nodes_main.txt qa/rpc-tests/decodescript.py qa/rpc-tests/test_framework/util.py src/Makefile.am src/Makefile.qt.include src/Makefile.qttest.include src/Makefile.test.include src/bitcoin-cli-res.rc src/bitcoin-cli.cpp src/bitcoin-tx.cpp src/bitcoind.cpp src/chainparams.cpp src/chainparamsseeds.h src/init.cpp src/main.cpp src/main.h src/miner.cpp src/net.cpp src/primitives/block.cpp src/rpc/mining.cpp src/rpc/rawtransaction.cpp src/rpc/server.cpp src/rpcserver.h src/script/interpreter.cpp src/script/script.cpp src/script/script.h src/test/alert_tests.cpp src/test/data/alertTests.raw src/test/data/script_invalid.json src/test/data/script_valid.json src/test/data/tx_invalid.json src/test/data/tx_valid.json src/test/miner_tests.cpp src/test/script_tests.cpp src/test/test_bitcoin.cpp src/test/test_bitcoin.h src/test/transaction_tests.cpp src/timedata.cpp src/util.cpp src/wallet/rpcwallet.cpp src/wallet/wallet.cpp src/wallet/wallet.h		2016-05-15 22:16:56 -04:00
..
forms	[Qt] Debug window: replace "Build date" with "Datadir"	2016-03-22 08:40:10 +01:00
locale	qt: periodic translations pull from transifex	2016-01-04 09:48:44 +01:00
res	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
test	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
addressbookpage.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
addressbookpage.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
addresstablemodel.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
addresstablemodel.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
askpassphrasedialog.cpp	Merge branch 'master' into single_prodname	2016-02-03 05:41:13 +00:00
askpassphrasedialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
bantablemodel.cpp	Double semicolon cleanup.	2015-12-30 12:23:07 -05:00
bantablemodel.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
bitcoin.cpp	Merge branch 'master' into single_prodname	2016-02-03 05:41:13 +00:00
bitcoin.qrc	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
bitcoin_locale.qrc	qt: Final translation update before 0.12 fork	2015-12-02 14:28:35 +01:00
bitcoinaddressvalidator.cpp	Added "Core" to copyright headers	2014-12-19 19:55:32 +01:00
bitcoinaddressvalidator.h	Added "Core" to copyright headers	2014-12-19 19:55:32 +01:00
bitcoinamountfield.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
bitcoinamountfield.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
bitcoingui.cpp	Merge branch 'master' into single_prodname	2016-02-03 05:41:13 +00:00
bitcoingui.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
bitcoinstrings.cpp	Add missing copyright headers	2016-01-05 21:34:15 +01:00
bitcoinunits.cpp	Merge pull request #7205	2016-01-05 14:11:40 +01:00
bitcoinunits.h	Merge pull request #7205	2016-01-05 14:11:40 +01:00
clientmodel.cpp	[Qt] remove unused formatBuildDate method	2016-03-24 21:48:45 +01:00
clientmodel.h	[Qt] remove unused formatBuildDate method	2016-03-24 21:48:45 +01:00
coincontroldialog.cpp	Use CCoinControl selection in CWallet::FundTransaction	2016-03-08 15:14:47 +00:00
coincontroldialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
coincontroltreewidget.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
coincontroltreewidget.h	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
csvmodelwriter.cpp	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
csvmodelwriter.h	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
editaddressdialog.cpp	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
editaddressdialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
guiconstants.h	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
guiutil.cpp	Merge pull request #7205	2016-01-05 14:11:40 +01:00
guiutil.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
intro.cpp	Merge branch 'master' into single_prodname	2016-02-03 05:41:13 +00:00
intro.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
macdockiconhandler.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
macdockiconhandler.mm	qt: update forgotten emit to Q_EMIT in macdockiconhandler.mm	2015-07-15 15:09:31 +02:00
macnotificationhandler.h	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
macnotificationhandler.mm	Remove references to X11 licence	2014-12-16 15:56:50 +08:00
Makefile	build: add stub makefiles for easier subdir builds	2014-06-05 16:05:43 -04:00
networkstyle.cpp	Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge	2016-05-15 22:16:56 -04:00
networkstyle.h	Added "Core" to copyright headers	2014-12-19 19:55:32 +01:00
notificator.cpp	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
notificator.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
openuridialog.cpp	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
openuridialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
optionsdialog.cpp	Merge branch 'master' into single_prodname	2016-02-03 05:41:13 +00:00
optionsdialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
optionsmodel.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
optionsmodel.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
overviewpage.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
overviewpage.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
paymentrequest.proto	Payment Protocol: X509-validated payment requests	2013-08-22 16:18:25 +10:00
paymentrequestplus.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
paymentrequestplus.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
paymentserver.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
paymentserver.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
peertablemodel.cpp	Merge pull request #7205	2016-01-05 14:11:40 +01:00
peertablemodel.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
platformstyle.cpp	qt: Introduce PlatformStyle	2015-07-31 09:35:18 +02:00
platformstyle.h	qt: Introduce PlatformStyle	2015-07-31 09:35:18 +02:00
qvalidatedlineedit.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
qvalidatedlineedit.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
qvaluecombobox.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
qvaluecombobox.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
receivecoinsdialog.cpp	[Qt] rename "amount" to "requested amount" in receive coins table	2016-01-20 17:30:06 +01:00
receivecoinsdialog.h	[Qt] rename "amount" to "requested amount" in receive coins table	2016-01-20 17:30:06 +01:00
receiverequestdialog.cpp	Add missing copyright headers	2016-01-05 21:34:15 +01:00
receiverequestdialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
recentrequeststablemodel.cpp	[Qt] rename "amount" to "requested amount" in receive coins table	2016-01-20 17:30:06 +01:00
recentrequeststablemodel.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
rpcconsole.cpp	Clear the input line after activating autocomplete	2016-03-30 20:26:10 +02:00
rpcconsole.h	Merge #7668: Fix history deletion bug after font size change	2016-03-14 09:24:39 +01:00
sendcoinsdialog.cpp	[qt] Remove unneeded "fSendFreeTransactions" check	2016-03-17 14:48:12 +01:00
sendcoinsdialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
sendcoinsentry.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
sendcoinsentry.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
signverifymessagedialog.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
signverifymessagedialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
splashscreen.cpp	Merge branch 'master' into single_prodname	2016-02-03 05:41:13 +00:00
splashscreen.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
trafficgraphwidget.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
trafficgraphwidget.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
transactiondesc.cpp	Merge #7707: [RPC][QT] UI support for abandoned transactions	2016-04-04 09:58:33 +02:00
transactiondesc.h	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
transactiondescdialog.cpp	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
transactiondescdialog.h	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
transactionfilterproxy.cpp	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
transactionfilterproxy.h	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
transactionrecord.cpp	Merge #7707: [RPC][QT] UI support for abandoned transactions	2016-04-04 09:58:33 +02:00
transactionrecord.h	Merge #7707: [RPC][QT] UI support for abandoned transactions	2016-04-04 09:58:33 +02:00
transactiontablemodel.cpp	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
transactiontablemodel.h	QT: Add 'copy full transaction details' option	2016-03-07 19:50:57 -05:00
transactionview.cpp	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
transactionview.h	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
utilitydialog.cpp	Merge branch 'master' into single_prodname	2016-02-03 05:41:13 +00:00
utilitydialog.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
walletframe.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
walletframe.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
walletmodel.cpp	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
walletmodel.h	[Qt] Support for abandoned/abandoning transactions	2016-04-04 09:25:34 +02:00
walletmodeltransaction.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
walletmodeltransaction.h	Bump copyright headers to 2014	2016-01-05 21:01:39 +01:00
walletview.cpp	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
walletview.h	Bump copyright headers to 2015	2015-12-13 18:08:39 +01:00
winshutdownmonitor.cpp	Added "Core" to copyright headers	2014-12-19 19:55:32 +01:00
winshutdownmonitor.h	Added "Core" to copyright headers	2014-12-19 19:55:32 +01:00