grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into tx_queue_timeout

Browse Source 
Conflicts:
	ethcore/src/client/test_client.rs
	miner/src/miner.rs
This commit is contained in:
Tomasz Drwięga
2016-03-18 19:36:32 +01:00
parent 0dc1ddef9a 2309e19fd9
commit f8dd1a6354
24 changed files with 173 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sync/Cargo.toml
View File

@@ -10,7 +10,7 @@ authors = ["Ethcore <admin@ethcore.io"]
[dependencies]
ethcore-util = { path = "../util" }
ethcore = { path = "../ethcore" }
clippy = { version = "0.0.50", optional = true }
clippy = { version = "0.0.54", optional = true }
ethminer = { path = "../miner" }
log = "0.3"
env_logger = "0.3"