Merge branch 'master' into develop

10 years ago · d68756bc23
2 changed files with 5 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -1,5 +1,9 @@
 ## Ethereum C++ Client.

+[![Build
+Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20C%2B%2B%20master%20branch)](http://build.ethdev.com/builders/Linux%20C%2B%2B%20master%20branch/builds/-1) master [![Build
+Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20C%2B%2B%20develop%20branch)](http://build.ethdev.com/builders/Linux%20C%2B%2B%20develop%20branch/builds/-1) develop
+
 By Gav Wood, 2014.

 [![Build
--- a/libethcore/CommonEth.cpp
+++ b/libethcore/CommonEth.cpp
@ -32,7 +32,7 @@ namespace dev
 namespace eth
 {

-const unsigned c_protocolVersion = 50;
+const unsigned c_protocolVersion = 49;
 const unsigned c_databaseVersion = 5;

 static const vector<pair<u256, string>> g_units =