Merge branch 'alexvandesande-ui' into develop

5238b943 · Jeffrey Wilcke · fe94622e · 9a2be227 · 5238b943
Commit 5238b943 authored Feb 17, 2015 by Jeffrey Wilcke
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -888,7 +888,7 @@ ApplicationWindow {
        function addPeer(peer) { peerModel.append(peer) }

        function setPeerCounters(text) {
-            peerCounterLabel.text = text
+            //peerCounterLabel.text = text
        }

        function timeAgo(unixTs){