Skip to content

0.6.1#373

Merged
ca333 merged 2560 commits intomasterfrom
beta
Jun 30, 2020
Merged

0.6.1#373
ca333 merged 2560 commits intomasterfrom
beta

Conversation

@ca333
Copy link
Copy Markdown

@ca333 ca333 commented Jun 21, 2020

No description provided.

dimxy and others added 30 commits February 21, 2020 02:37
priceslibs Makefile fix
934245c
index vars separated
dfd520e
@ca333
Merge pull request #286 from jl777/jl777
edf7ec1 
sync DEX
fix set localbits ranges for testchain
4abf89c
@jl777
Fix default otc mode
0e09251
fix win load so
0b572e4
fix close so lib
663a251
fix forward decl
bbb6975
fix dlsym call
d5e7413
@jl777
dpow round proposal
7ed82ef
@jl777
Ptr
8930b42
@jl777
Array
922d7a9
@jl777
Size
c1a02c4
@jl777
Str
2968724
@jl777
Suppress dpow_notarize call for now
a7093e1
@jl777
Test
03ea309
@jl777
+print
2b9b9ad
@jl777
+print
05f3733
@jl777
Reverse tagA and tagB
ae877c2
@jl777
-print
0026e9e
add dll/so ext
52a5b85
fix priceslibs makefile
a0a3307
@jl777
matchB
e69761e
moved ReadConfigFile before komodo_args to enable put args in config
15c9262
fix build.sh's for CXX vars for priceslibs make
3ee5ac6
removed unbound CC vars
982cc17
added export for dll
3496b97
added export for dlls
39ba3c9
@jl777
History test
8f92ef1
@jl777
-)
2c74de9
ca333 and others added 18 commits June 14, 2020 09:01
@ca333
update funcs.mk
91d000e 
#368 (review)
DeckerSU/KomodoOcean@85d2fa6
bitcoin/bitcoin@89bee1b
@ca333
Merge pull request #368 from crackfoo/patch-4
3bb5331 
Update funcs.mk
@gcharang
updates assetchains.json to mirror dPoW repo
19c27f2
@gcharang
updates the assetchains.old file to mirror the dPoW repo
b37b004
@gcharang
removes cli files of etomic and kv
30cfb89
@ca333
Merge pull request #371 from gcharang/dev
e159b4e 
Updates assetchain files to mirror dPoW repo
@ca333
resolve conflict net.h
d2d2ac3
@ca333
resolve conflict miner.cpp
2ba9366
@jl777
Merge pull request jl777#1850 from ca333/patch-13
2b2df5d 
resolve conflict net.h
@ca333
resolve conflict komodod_ci.yml
fba0c71
@ca333
resolve conflict pytest_util.py
a99809d
@ca333
resolve conflict conftest.py
5529641
@jl777
Merge pull request jl777#1851 from ca333/patch-13
ac4498c 
resolve conflicts
@ca333
Merge branch 'dev' into dev
54fd345
@ca333
revert conflict resolution merge from jl777:dev
7fddf74
@ca333
Merge pull request #370 from KomodoPlatform/dev
d98b51b 
sync beta
@ca333
bump version
5000f2a
@ca333
Merge pull request #374 from KomodoPlatform/dev
dd40e2d 
bump version
@ca333 ca333 marked this pull request as ready for review June 28, 2020 22:48
gcharang
gcharang approved these changes Jun 29, 2020
View reviewed changes
Copy link
Copy Markdown

@gcharang gcharang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am approving the changes done by myself

@himu007
Copy link
Copy Markdown

himu007 commented Jun 29, 2020 •
edited
Loading

Any reason for reverting this commit to remove only few $1 from assetchains.old file? 97e3b9f#diff-2c8849af23a58f6667e9e48a9d2f2dd1

@ca333 ca333 merged commit 666047b into master Jun 30, 2020
@TheComputerGenie TheComputerGenie mentioned this pull request Jun 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DeckerSU DeckerSU DeckerSU approved these changes

@Alrighttt Alrighttt Awaiting requested review from Alrighttt

@smk762 smk762 Awaiting requested review from smk762

+2 more reviewers

@gcharang gcharang gcharang approved these changes

@tonymorony tonymorony tonymorony approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.