jl777 bc17ac4928 Merge remote-tracking branch 'zcash/master' into rebase ...

# Conflicts:
#	README.md
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/init.cpp
#	src/miner.cpp
#	src/wallet/wallet.cpp

2016-12-12 12:19:13 +02:00

..

gtest

Auto merge of #1904 - str4d:1749-write-witness-cache-with-best-block, r=ebfull

2016-12-09 21:11:15 +00:00

test

test

2016-11-15 18:28:07 -03:00

asyncrpcoperation_sendmany.cpp

Merge remote-tracking branch 'zcash/master' into rebase

2016-12-12 12:19:13 +02:00

asyncrpcoperation_sendmany.h

Auto merge of #1911 - bitcartel:1823_witness_does_not_have_same_anchor_as_change_input, r=str4d

2016-12-08 01:23:40 +00:00

crypter.cpp

Auto merge of #1429 - str4d:867-update-dependencies, r=str4d

2016-10-04 03:48:42 -04:00

crypter.h

Cache note decryptors in encrypted keystore

2016-09-29 11:34:59 +13:00

db.cpp

test

2016-11-27 10:18:00 -03:00

db.h

fix crash on shutdown when e.g. changing -txindex and abort action

2015-06-23 10:12:11 +02:00

rpcdump.cpp

test

2016-11-14 15:00:25 -03:00

rpcwallet.cpp

Merge remote-tracking branch 'zcash/master' into rebase

2016-12-12 12:19:13 +02:00

wallet_ismine.cpp

[Move Only] Move wallet related things to src/wallet/

2015-03-12 14:13:02 +01:00

wallet_ismine.h

ensure consistent header comment naming conventions

2015-04-20 13:29:22 +02:00

wallet.cpp

Merge remote-tracking branch 'zcash/master' into rebase

2016-12-12 12:19:13 +02:00

wallet.h

Merge remote-tracking branch 'zcash/master' into rebase

2016-12-12 12:19:13 +02:00

walletdb.cpp

Change some Bitcoin strings to Zcash strings.

2016-10-26 13:29:05 -06:00

walletdb.h

Update to use new API in CCryptoKeyStore and store a viewing key in walletdb.

2016-09-29 20:17:30 -07:00