Merge branch 'master' into miner-spec-refact

Conflicts:
	ethcore/build.rs
This commit is contained in:
Nikolay Volf 2016-05-16 19:46:56 +03:00
commit caec38d533

View File

@ -30,5 +30,4 @@ fn main() {
codegen::register(&mut registry);
registry.expand("", &src, &dst).unwrap();
}
}