Merge branch 'develop'

Conflicts:
	install.sh

2 files changed, 11 insertions, 5 deletions

diff --git a/ethereal/main.go b/ethereal/main.go
index 799b50e4b..1674b59d9 100644
--- a/ethereal/main.go
+++ b/ethereal/main.go
@@ -10,10 +10,11 @@ import (
 )
 
 func main() {
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
+	// Leave QT on top at ALL times.
 	qml.Init(nil)
 
+	runtime.GOMAXPROCS(runtime.NumCPU())
+
 	var interrupted = false
 	utils.RegisterInterrupt(func(os.Signal) {
 		interrupted = true
diff --git a/install.sh b/install.sh
index 4526eb002..fe80a6956 100755
--- a/install.sh
+++ b/install.sh
@@ -26,13 +26,18 @@ if [ $? != 0 ]; then
 	exit
 fi
 
+echo "serpent-go"
 cd $GOPATH/src/github.com/obscuren/mutan
+
+echo "init submodule"
 git submodule init
-git sumbodule update
+git submodule update
 
+echo "eth-go"
 cd $GOPATH/src/github.com/ethereum/eth-go
 git checkout $branch
 
+echo "go-ethereum"
 cd $GOPATH/src/github.com/ethereum/go-ethereum/$exe
 git checkout $branch
 
@@ -40,9 +45,9 @@ if [ "$exe" == "ethereal" ]; then
 	echo "Building ethereal GUI. Assuming Qt is installed. If this step"
 	echo "fails; please refer to: https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)"
 else
-	echo "Building ethereum CLI.
+	echo "Building ethereum CLI."
 fi
 
 go install
 
-echo "done..."
+echo "done. Please run $exe :-)"