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

ethereum · Feb 17, 2016 · 998f43e · 998f43e
2 parents 8cae72a + 413f624
commit 998f43e
Show file tree

Hide file tree

Showing 9 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.1.3")
+project(cpp-ethereum VERSION "1.1.4")
 
 include(EthCompilerSettings)
 

diff --git a/alethzero b/alethzero
diff --git a/dependency_graph/generate.py b/dependency_graph/generate.py
@@ -97,7 +97,11 @@ def processSubmodule(root, submodule):
     if "solidity" in submodule:
         print '    "soljson" -> "solidity"'
 
-    print getLibraryAndApplicationNames(submodulePath)
+    # Mix doesn't have the same sub-module structure as everything else
+    if (submodule == "mix"):
+        print 'Mix\n'
+    else:
+        print getLibraryAndApplicationNames(submodulePath)
 
     if (submodule == "libethereum"):
         print "        bgcolor = LavenderBlush"
@@ -127,6 +131,9 @@ def processUmbrella(root):
                     and not ("webthree-helpers" in absPath):
                         processSubmodule(root, submodule)
 
+    # Mix doesn't have the same sub-module structure as everything else
+    print getDependencyEdges(root, "mix")
+
 
 print 'digraph webthree {'
 print '    graph [ label   = "webthree dependencies" ]'

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/webthree b/webthree
diff --git a/webthree-helpers b/webthree-helpers
+1 −1		CMakeLists.txt
+1 −1		alethone/AlethOne.cpp
+1 −1		alethone/AlethOne.h
+0 −46		alethzero/plugins/log/Sentinel.cpp
+0 −43		alethzero/plugins/log/Sentinel.h
+0 −2		libaleth/Slave.cpp
+0 −2		libaleth/Slave.h
+1 −1		CMakeLists.txt
+1 −0		ethminer/MinerAux.h
+0 −1		libethereum/BlockChainSync.h
+1 −3		libethereum/CMakeLists.txt
+0 −109		libethereum/Client.cpp
+0 −5		libethereum/Client.h
+0 −31		libethereum/Sentinel.h
+0 −3		libethereum/Sentinel.json
+2 −2		CMakeLists.txt
+10 −2		qml/AboutMix.qml
+2 −2		qml/BlockChain.qml
+0 −13		qml/CodeEditorView.qml
+1 −0		qml/DeploymentDialog.qml
+17 −1		qml/MainContent.qml
+11 −22		qml/TransactionDialog.qml
+8 −2		src/ClientModel.cpp
+8 −2		src/ClientModel.h
+2 −0		src/MachineStates.h
+1 −0		src/MixApplication.cpp
+3 −0		src/MixApplication.h
+7 −6		src/MixClient.cpp
+1 −1		CMakeLists.txt
+12 −2		docs/frequently-asked-questions.rst
+5 −0		docs/types.rst
+21 −0		libsolidity/analysis/TypeChecker.cpp
+5 −0		libsolidity/ast/Types.cpp
+1 −0		libsolidity/ast/Types.h
+26 −0		libsolidity/codegen/ExpressionCompiler.cpp
+36 −0		test/libsolidity/SolidityEndToEndTest.cpp
+28 −0		test/libsolidity/SolidityNameAndTypeResolution.cpp
+10 −10		homebrew/cpp-ethereum.rb.in
+1 −1		utils/CMakeLists.txt