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

Merge branch 'master' into tx_queue_live

Browse Source 
Conflicts:
	miner/src/miner.rs
This commit is contained in:
Tomasz Drwięga
2016-03-18 19:31:14 +01:00
parent cee45e1a8e 2309e19fd9
commit 62c32eb288
24 changed files with 172 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/Cargo.toml
View File

@@ -22,7 +22,7 @@ ethminer = { path = "../miner" }
rustc-serialize = "0.3"
transient-hashmap = "0.1"
serde_macros = { version = "0.7.0", optional = true }
clippy = { version = "0.0.50", optional = true }
clippy = { version = "0.0.54", optional = true }
[build-dependencies]
serde_codegen = { version = "0.7.0", optional = true }