OSDN Git Service

merge master
authoroys <oys@oysdeMBP.localdomain>
Thu, 11 Jul 2019 07:46:49 +0000 (15:46 +0800)
committeroys <oys@oysdeMBP.localdomain>
Thu, 11 Jul 2019 07:46:49 +0000 (15:46 +0800)
commitf5528cbb934d3fc20f7e0fd3264fb9d7e5672d52
tree910105905b58f50afa8bffcc67d38730f8f941f6
parent41d53561acfb5ed7ae357808708fa6cd9032feb0
parent5d4626d20a2e591b219f2e48b7391e5be1cf88ef
merge master
consensus/general.go
test/tx_test_util.go
wallet/annotated.go