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

Merge branch 'master' into auth-round

Browse Source 
Conflicts:
	ethcore/src/miner/miner.rs
	sync/Cargo.toml
This commit is contained in:
keorn
2016-09-19 14:35:44 +02:00
parent ce3e8750c9 551b5d7b6c
commit 49fba0b548
63 changed files with 1746 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json/Cargo.toml
View File

@@ -10,7 +10,7 @@ rustc-serialize = "0.3"
serde = "0.8"
serde_json = "0.8"
serde_macros = { version = "0.8", optional = true }
clippy = { version = "0.0.85", optional = true}
clippy = { version = "0.0.90", optional = true}
[build-dependencies]
serde_codegen = { version = "0.8", optional = true }