jl777
|
53e66f1170
|
Merge branch 'dev' into FSM
# Conflicts:
# depends/packages/zeromq.mk
# src/assetchains.json
|
2019-02-27 04:31:00 -11:00 |
|
Jonathan "Duke" Leto
|
bb03c1d872
|
Update zeromq to 4.3.1
|
2019-02-17 06:03:35 -08:00 |
|
Asher Dawes
|
155d2cb3e4
|
Removing unnecessary slashes
changing brewfile dependency of gcc@5 to gcc@6
|
2018-08-18 00:44:01 -07: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 |
|
Cory Fields
|
038a858d2f
|
depends: use c++11
|
2017-11-29 17:24:59 +00:00 |
|
ca333
|
9d36579649
|
uni3
|
2017-10-09 11:45:49 +02:00 |
|
Jack Grigg
|
602407de95
|
[depends] ZeroMQ 4.2.1
|
2017-02-08 22:11:53 +00:00 |
|
fanquake
|
00bcf2230d
|
[depends] ZeroMQ 4.1.5
|
2017-02-08 22:11:53 +00:00 |
|
fanquake
|
c3c55e10e8
|
[depends] ZeroMQ 4.1.4
|
2017-02-08 22:11:53 +00:00 |
|
fanquake
|
6702d371c5
|
[depends] zeromq 4.0.7
|
2017-02-08 22:10:42 +00:00 |
|
Cory Fields
|
cce7754eb8
|
Depends: Add ZeroMQ package
|
2017-02-08 22:10:42 +00:00 |
|