jl777 e73b2055c6 Merge branch 'beta' into mergemaster ...

# Conflicts:
#	src/main.cpp

2018-04-16 10:16:01 +03:00

..

gtest

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

test

test

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

asyncrpcoperation_mergetoaddress.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

asyncrpcoperation_mergetoaddress.h

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

asyncrpcoperation_sendmany.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

asyncrpcoperation_sendmany.h

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

asyncrpcoperation_shieldcoinbase.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

asyncrpcoperation_shieldcoinbase.h

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

crypter.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

crypter.h

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

db.cpp

WIN32 -> _WIN32

2017-10-15 02:04:29 +03:00

db.h

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

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

rpcdisclosure.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

rpcdump.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

rpcwallet.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

wallet_ismine.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

wallet_ismine.h

ensure consistent header comment naming conventions

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

wallet.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

wallet.h

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

walletdb.cpp

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

walletdb.h

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00