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

Merge branch 'master' into auth-bft

Browse Source
This commit is contained in:
keorn
2016-12-12 21:28:46 +01:00
parent 19adb84527 d2a34acdfd
commit fa504e510f
1537 changed files with 7013 additions and 3760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json/src/spec/engine.rs
View File

@@ -1,4 +1,4 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify