Merge remote-tracking branch 'origin/develop' into release

ethereum · Jun 7, 2016 · 597de04 · 597de04
2 parents 0a5bb2a + 29b665b
commit 597de04
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-project(cpp-ethereum VERSION "1.2.6")
+project(cpp-ethereum VERSION "1.2.7")
 
 include(EthCompilerSettings)
 

diff --git a/libethereum b/libethereum
diff --git a/libweb3core b/libweb3core
diff --git a/mix b/mix
diff --git a/webthree b/webthree
diff --git a/webthree-helpers b/webthree-helpers