OSDN Git Service

merge bvm branch with master
authorColt <colt@ColtdeMBP.lan>
Tue, 5 Sep 2017 02:16:07 +0000 (10:16 +0800)
committerColt <colt@ColtdeMBP.lan>
Tue, 5 Sep 2017 02:16:07 +0000 (10:16 +0800)
commit216ce19e51345fd1472f7e35a866ab0cc9fe61e3
tree5b8b6dba68ad8cb78cf442e445220bec55491d7a
parent502eedd2a86677845262ffbbffd8ecf3cb6f6073
parentf004c70dec72a81c628c55786b4bf73288fc1f28
merge bvm branch with master
protocol/block.go
protocol/protocol.go