grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
e54784bfeb
openethereum/ethcore/src
History
Fredrik e54784bfeb Merge branch 'master' into fo-6418-dont-export-bigint 
# Conflicts:
#	dapps/src/tests/helpers/registrar.rs
#	ethcore/evm/src/interpreter/shared_cache.rs
#	ethcore/light/src/client/header_chain.rs
#	ethcore/light/src/client/mod.rs
#	ethcore/light/src/net/mod.rs
#	ethcore/light/src/on_demand/request.rs
#	ethcore/light/src/on_demand/tests.rs
#	ethcore/light/src/provider.rs
#	ethcore/node_filter/src/lib.rs
#	ethcore/src/block.rs
#	ethcore/src/blockchain/blockchain.rs
#	ethcore/src/client/test_client.rs
#	ethcore/src/engines/authority_round/mod.rs
#	ethcore/src/engines/basic_authority.rs
#	ethcore/src/engines/mod.rs
#	ethcore/src/engines/tendermint/mod.rs
#	ethcore/src/engines/validator_set/contract.rs
#	ethcore/src/engines/validator_set/multi.rs
#	ethcore/src/engines/validator_set/safe_contract.rs
#	ethcore/src/engines/vote_collector.rs
#	ethcore/src/miner/external.rs
#	ethcore/src/miner/miner.rs
#	ethcore/src/miner/service_transaction_checker.rs
#	ethcore/src/miner/work_notify.rs
#	ethcore/src/pod_account.rs
#	ethcore/src/pod_state.rs
#	ethcore/src/snapshot/block.rs
#	ethcore/src/snapshot/consensus/work.rs
#	ethcore/src/snapshot/mod.rs
#	ethcore/src/snapshot/service.rs
#	ethcore/src/spec/spec.rs
#	ethcore/src/state/backend.rs
#	ethcore/src/trace/db.rs
#	ethcore/src/verification/queue/mod.rs
#	ethcore/src/verification/verification.rs
#	parity/informant.rs
#	rpc/src/v1/helpers/dispatch.rs
#	rpc/src/v1/helpers/light_fetch.rs
#	rpc/src/v1/helpers/signing_queue.rs
#	rpc/src/v1/impls/eth.rs
#	rpc/src/v1/impls/eth_filter.rs
#	rpc/src/v1/impls/eth_pubsub.rs
#	rpc/src/v1/impls/light/eth.rs
#	rpc/src/v1/impls/signing.rs
#	rpc/src/v1/tests/helpers/miner_service.rs
#	rpc/src/v1/tests/helpers/snapshot_service.rs
#	rpc/src/v1/tests/helpers/sync_provider.rs
#	rpc/src/v1/tests/mocked/eth.rs
#	stratum/src/lib.rs
#	sync/src/blocks.rs
#	sync/src/chain.rs
#	sync/src/light_sync/mod.rs
#	sync/src/tests/helpers.rs
#	sync/src/tests/snapshot.rs
#	updater/src/updater.rs
#	util/src/lib.rs
#	util/triehash/src/lib.rs
2017-09-04 18:32:55 +02:00
..
account_provider Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
blockchain Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
blooms Remove reexport of HeapSizeOf in util (#6419) 2017-08-30 16:04:47 +02:00
client Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
engines Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
ethereum Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
json_tests Running state test using parity-evm (#6355) 2017-08-28 14:25:16 +02:00
migrations Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
miner Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
snapshot Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
spec Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
state Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
tests Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
trace Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
verification Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
views Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
account_db.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
basic_types.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
block.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
builtin.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
cache_manager.rs Fix whitespace (#4299) 2017-01-25 18:51:41 +01:00
db.rs remove re-export of parking_lot in util (#6435) 2017-09-02 20:09:13 +02:00
encoded.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
error.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
executed.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
executive.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
externalities.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
factory.rs Fix whitespace (#4299) 2017-01-25 18:51:41 +01:00
header.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00
lib.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
pod_account.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
pod_state.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
service.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
state_db.rs Merge branch 'master' into fo-6418-dont-export-bigint 2017-09-04 18:32:55 +02:00
timer.rs move timer.rs to ethcore (#6437) 2017-09-02 10:54:39 +02:00
transaction.rs Don't reexport bigint from util 2017-09-04 16:36:49 +02:00