OSDN Git Service

Merge branch 'dev' into dev-verify
[bytom/bytom.git] / consensus /
2017-10-31 Blockmeta-区块元Merge branch 'dev' into wallet
2017-10-31 gguossMerge branch 'dev' of https://github.com/Bytom/bytom...
2017-10-31 paladzset the init block bits
2017-10-31 Guanghua GuoMerge pull request #75 from Bytom/dev v0.1.3
2017-10-31 paladzupdate the init block bits
2017-10-31 paladzmerge with dev
2017-10-29 paladzmerge with the dev
2017-10-28 Blockmeta-区块元Merge branch 'dev' into wallet
2017-10-28 Blockmeta-区块元Merge branch 'dev' into wallet
2017-10-25 jianyixunMerge branch 'dev' into wallet
2017-10-25 paladzMerge branch 'dev' into bvm
2017-10-25 paladzMerge branch 'dev' into bvm
2017-10-25 paladzfix bug for end to end test
2017-10-24 paladzfix bug for end to end test
2017-10-24 jianyixunAdd sw address
2017-10-13 Guanghua GuoMerge pull request #49 from Bytom/dev v0.1.1
2017-10-10 gguossMerge branch 'dev' of github.com:Bytom/bytom into dev
2017-10-10 paladzMerge branch 'dev' into bvm
2017-10-10 paladzinit version for enable mining diff calculate func
2017-09-28 gguossMerge branch 'demo'
2017-09-26 icodezjbMerge pull request #7 from Bytom/demo
2017-09-26 jianyixunMerge branch 'demo' of https://github.com/Bytom/bytom...
2017-09-26 paladzfix the merge bug
2017-09-26 paladzcode need to be little better elegant
2017-09-26 gguossfix conflicts
2017-09-26 gguossMerge branch 'demo'
2017-09-26 icodezjbMerge pull request #6 from Bytom/demo
2017-09-25 paladzMerge branch 'demo' into bvm
2017-09-25 paladzMerge branch 'demo' into bvm
2017-09-25 paladzMerge branch 'calDiff' into bvm
2017-09-25 paladzfinish but untest calDiff, due to need work on other...
2017-09-25 paladztmp save for developing
2017-09-24 Guanghua GuoMerge branch 'demo' into demo
2017-09-23 paladzMerge branch 'bvm' into demo
2017-09-23 paladzadd custom init block
2017-09-22 Blockmeta-区块元Merge branch 'master' into demo
2017-09-22 gguossMerge branch 'demo' of https://github.com/Bytom/bytom...
2017-09-22 gguossMerge branch 'master' into demo
2017-09-22 Blockmeta-区块元Merge pull request #27 from Blockmeta/master
2017-09-22 paladzMerge branch 'demo' of https://github.com/Bytom/blockch...
2017-09-22 paladzMerge branch 'bvm' into demo
2017-09-22 paladzmove difficulty part code to a file
2017-09-22 paladzBTM asset id should be define in the consensus folder
2017-09-22 paladzmove the max tx size and block size to the consensus...
2017-09-21 Blockmeta-区块元Merge pull request #2 from Bytom/demo
2017-09-21 Blockmeta-区块元Merge pull request #24 from Blockmeta/master
2017-09-21 zhouyasongmmerge zhouyasong-patch-1 to demo
2017-09-21 paladzmerge with master baby
2017-09-17 paladzinit version of merger all thr things together
2017-09-07 ColtMerge branch 'consensus' into bvm
2017-09-04 Colttmp save for branch merge
2017-08-04 jeasonreorgnise consensus folder