DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
15,531 Commits 6 Branches 7 Tags
643bc61b9ec541533d7e80b1d47b24f5d6a42aab
Commit Graph
15531 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777 643bc61b9e Test 2018-03-25 22:50:36 +03:00
jl777 287a665404 Test 2018-03-25 22:48:54 +03:00
jl777 e74e837eb9 Test 2018-03-25 22:45:32 +03:00
jl777 c13f04b795 Test 2018-03-25 22:30:56 +03:00
jl777 eb9facd492 Merge branch 'dev' into jl777 2018-03-25 22:24:20 +03:00
jl777 ba5723c77d Merge pull request #541 from jl777/rebase2 
Rebase2 zcash 0.15
 2018-03-25 22:17:28 +03:00
jl777 694e664eb9 Test 2018-03-25 21:49:50 +03:00
jl777 04824d85ef Test 2018-03-25 21:42:54 +03:00
jl777 3fc8685f0e Test 2018-03-25 21:37:22 +03:00
jl777 1ade213100 Test 2018-03-25 21:20:12 +03:00
jl777 028a570576 Test 2018-03-25 21:18:25 +03:00
jl777 aa22b9566a Test 2018-03-25 21:17:46 +03:00
jl777 b35fd60032 Test 2018-03-25 21:16:11 +03:00
jl777 d78a07c645 Test 2018-03-25 21:15:11 +03:00
jl777 d7b577307e Test 2018-03-25 21:08:29 +03:00
jl777 b929c085ee Test 2018-03-25 21:04:58 +03:00
jl777 9f8c713560 Test 2018-03-25 21:03:37 +03:00
jl777 96ac204532 Test 2018-03-25 21:00:57 +03:00
jl777 269342f825 Test 2018-03-25 20:59:50 +03:00
jl777 2d9aa109d8 Test 2018-03-25 20:58:31 +03:00
jl777 366c88dcd1 Test 2018-03-25 20:54:53 +03:00
jl777 efd0823e78 Test 2018-03-25 20:54:00 +03:00
jl777 08211cf05d Test 2018-03-25 20:41:58 +03:00
jl777 a2dd1d4301 Test 2018-03-25 20:39:58 +03:00
jl777 c0d53a6eb6 Test 2018-03-25 20:36:24 +03:00
jl777 4ffda01dbd Test 2018-03-25 20:35:01 +03:00
jl777 fe67b7ef43 Test 2018-03-25 20:32:35 +03:00
jl777 499a7537c1 Test 2018-03-25 20:31:32 +03:00
jl777 f4feb5043e Test 2018-03-25 20:22:59 +03:00
jl777 c08d6c56a6 Test 2018-03-25 20:21:46 +03:00
jl777 d0fcb6bcc7 Test 2018-03-25 20:19:42 +03:00
jl777 6c09a95380 Test 2018-03-25 20:17:53 +03:00
jl777 60afdb8bbd Test 2018-03-25 20:12:21 +03:00
jl777 41be81695d Test 2018-03-25 20:07:57 +03:00
jl777 aef60c21e8 Test 2018-03-25 20:05:02 +03:00
jl777 9ab007f849 Test 2018-03-25 19:58:04 +03:00
jl777 2cfe782d69 Test 2018-03-25 19:57:34 +03:00
jl777 39b00d0594 Test 2018-03-25 19:51:08 +03:00
jl777 e9fac08611 Test 2018-03-25 19:48:21 +03:00
jl777 753997b6de Test 2018-03-25 19:34:35 +03:00
jl777 b380fd6321 Test 2018-03-25 19:27:12 +03:00
jl777 995fee09af Test 2018-03-25 19:14:36 +03:00
jl777 b49b22afd0 Test 2018-03-25 19:08:42 +03:00
jl777 9f2994ad23 Test 2018-03-25 19:05:37 +03:00
jl777 93c8c79bde Test 2018-03-25 19:03:22 +03:00
jl777 253b35b2ed Test 2018-03-25 18:48:39 +03:00
jl777 9000990c30 Merge remote-tracking branch 'zcash/master' into rebase2 
# Conflicts:
#	.travis.yml
#	Makefile.am
#	README.md
#	configure.ac
#	depends/Makefile
#	depends/builders/darwin.mk
#	depends/funcs.mk
#	depends/hosts/darwin.mk
#	depends/packages/googlemock.mk
#	depends/packages/googletest.mk
#	depends/packages/libsnark.mk
#	depends/packages/libsodium.mk
#	depends/packages/packages.mk
#	depends/packages/rust.mk
#	src/Makefile.am
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/chainparams.h
#	src/checkpoints.h
#	src/clientversion.h
#	src/coins.cpp
#	src/consensus/consensus.h
#	src/gtest/test_mempool.cpp
#	src/httprpc.cpp
#	src/init.cpp
#	src/komodo-tx.cpp
#	src/main.cpp
#	src/miner.cpp
#	src/policy/fees.cpp
#	src/policy/fees.h
#	src/rpcmining.cpp
#	src/rpcrawtransaction.cpp
#	src/rpcserver.cpp
#	src/test/policyestimator_tests.cpp
#	src/test/rpc_wallet_tests.cpp
#	src/test/transaction_tests.cpp
#	src/txdb.cpp
#	src/txmempool.cpp
#	src/wallet/asyncrpcoperation_sendmany.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/zcash/CreateJoinSplit.cpp
#	zcutil/build.sh
 2018-03-25 18:44:38 +03:00
jl777 2f8ffc3443 Fix typo 2018-03-24 21:17:36 +02:00
jl777 bc206f0741 Merge pull request #540 from letolabs/completion 
Bash completion for komodo-cli, komodo-tx and komodo
 2018-03-24 18:56:50 +02:00
Duke Leto 8f41e1da19 yes 2018-03-24 15:41:18 +00:00