OSDN Git Service
(root)
/
bytom
/
bytom-spv.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
Merge dev branch
[bytom/bytom-spv.git]
/
consensus
/
general.go
2017-10-31
paladz
merge with dev
blob
|
commitdiff
2017-10-29
paladz
merge with the dev
blob
|
commitdiff
2017-10-28
Blockmeta-区块元
Merge branch 'dev' into wallet
blob
|
commitdiff
|
diff to current
2017-10-28
Blockmeta-区块元
Merge branch 'dev' into wallet
blob
|
commitdiff
|
diff to current
2017-10-25
jianyixun
Merge branch 'dev' into wallet
blob
|
commitdiff
|
diff to current
2017-10-25
paladz
Merge branch 'dev' into bvm
blob
|
commitdiff
2017-10-25
paladz
Merge branch 'dev' into bvm
blob
|
commitdiff
2017-10-25
paladz
fix bug for end to end test
blob
|
commitdiff
2017-10-24
paladz
fix bug for end to end test
blob
|
commitdiff
2017-10-24
jianyixun
Add sw address
blob
|
commitdiff
|
diff to current
2017-10-13
Guanghua Guo
Merge pull request #49 from Bytom/dev
blob
|
commitdiff
|
diff to current
2017-10-10
gguoss
Merge branch 'dev' of github.com:Bytom/bytom into dev
blob
|
commitdiff
|
diff to current
2017-10-10
paladz
Merge branch 'dev' into bvm
blob
|
commitdiff
|
diff to current
2017-10-10
paladz
init version for enable mining diff calculate func
blob
|
commitdiff
|
diff to current
2017-09-28
gguoss
Merge branch 'demo'
blob
|
commitdiff
|
diff to current
2017-09-26
icodezjb
Merge pull request #7 from Bytom/demo
blob
|
commitdiff
|
diff to current
2017-09-26
jianyixun
Merge branch 'demo' of https://github.com/Bytom/bytom...
blob
|
commitdiff
|
diff to current
2017-09-26
paladz
fix the merge bug
blob
|
commitdiff
|
diff to current
2017-09-26
paladz
code need to be little better elegant
blob
|
commitdiff
|
diff to current
2017-09-26
gguoss
fix conflicts
blob
|
commitdiff
|
diff to current
2017-09-26
gguoss
Merge branch 'demo'
blob
|
commitdiff
|
diff to current
2017-09-26
icodezjb
Merge pull request #6 from Bytom/demo
blob
|
commitdiff
|
diff to current
2017-09-25
paladz
Merge branch 'demo' into bvm
blob
|
commitdiff
|
diff to current
2017-09-25
paladz
Merge branch 'demo' into bvm
blob
|
commitdiff
|
diff to current
2017-09-25
paladz
Merge branch 'calDiff' into bvm
blob
|
commitdiff
|
diff to current
2017-09-25
paladz
finish but untest calDiff, due to need work on other...
blob
|
commitdiff
|
diff to current
2017-09-25
paladz
tmp save for developing
blob
|
commitdiff
|
diff to current
2017-09-24
Guanghua Guo
Merge branch 'demo' into demo
blob
|
commitdiff
|
diff to current
2017-09-23
paladz
Merge branch 'bvm' into demo
blob
|
commitdiff
|
diff to current
2017-09-23
paladz
add custom init block
blob
|
commitdiff
|
diff to current
2017-09-22
Blockmeta-区块元
Merge branch 'master' into demo
blob
|
commitdiff
|
diff to current
2017-09-22
gguoss
Merge branch 'demo' of https://github.com/Bytom/bytom...
blob
|
commitdiff
|
diff to current
2017-09-22
gguoss
Merge branch 'master' into demo
blob
|
commitdiff
|
diff to current
2017-09-22
Blockmeta-区块元
Merge pull request #27 from Blockmeta/master
blob
|
commitdiff
|
diff to current
2017-09-22
paladz
Merge branch 'demo' of https://github.com/Bytom/blockch...
blob
|
commitdiff
|
diff to current
2017-09-22
paladz
Merge branch 'bvm' into demo
blob
|
commitdiff
|
diff to current
2017-09-22
paladz
move difficulty part code to a file
blob
|
commitdiff
|
diff to current
2017-09-22
paladz
BTM asset id should be define in the consensus folder
blob
|
commitdiff
|
diff to current
2017-09-22
paladz
move the max tx size and block size to the consensus...
blob
|
commitdiff
|
diff to current
2017-09-21
Blockmeta-区块元
Merge pull request #2 from Bytom/demo
blob
|
commitdiff
|
diff to current
2017-09-21
Blockmeta-区块元
Merge pull request #24 from Blockmeta/master
blob
|
commitdiff
|
diff to current
2017-09-21
zhouyasong
mmerge zhouyasong-patch-1 to demo
blob
|
commitdiff
|
diff to current
2017-09-21
paladz
merge with master baby
blob
|
commitdiff
|
diff to current
2017-09-17
paladz
init version of merger all thr things together
blob
|
commitdiff
|
diff to current