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

ethereum · Mar 2, 2016 · 1ae1c2d · 1ae1c2d
2 parents 9a2a1de + 4b63cf7
commit 1ae1c2d
Show file tree

Hide file tree

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

diff --git a/alethzero b/alethzero
diff --git a/dependency_graph/generate.py b/dependency_graph/generate.py
@@ -158,10 +158,17 @@ def processUmbrella(root):
 print "    }"
 print '    "base" -> "boost"'
 print '    "base" -> "Jsoncpp"'
+print '    "base" -> "json_spirit"'
 print '    "base" -> "LevelDB"'
 print '    "base" -> "pthreads"'
 print '    "secp256k1" -> "gmp"'
 
+# Hard-coded dependencies for 'libaleth', which doesn't have a UseAleth.cmake
+# to go with it, because the library is only used by the Aleth* applications,
+# and is not exposed to other applications.
+print '    "AlethZero" -> "aleth"'
+print '    "AlethOne" -> "aleth"'
+
 processUmbrella('..')
 
 print "}"
diff --git a/libethereum b/libethereum
diff --git a/libweb3core b/libweb3core
diff --git a/mix b/mix
diff --git a/solidity b/solidity
diff --git a/web3.js b/web3.js
diff --git a/webthree b/webthree
diff --git a/webthree-helpers b/webthree-helpers