Merge branch 'master' into miner-spec-refact

Conflicts: ethcore/build.rs
2016-05-16 19:46:56 +03:00
parent 8cc321fe24 4e41cbca81
commit caec38d533
1 changed files with 0 additions and 1 deletions
--- a/ethcore/build.rs
+++ b/ethcore/build.rs
@@ -30,5 +30,4 @@ fn main() {
 		codegen::register(&mut registry);
 		registry.expand("", &src, &dst).unwrap();
 	}
-
 }