aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-20 09:45:05 +0800
committerobscuren <geffobscura@gmail.com>2014-12-20 09:45:05 +0800
commit125bdc325352823bcf83a1a671a0bfaea1d7d7ff (patch)
treeb2720bfa2e26d8c39d0ef34653c7dee649c76821 /cmd
parent75f0412f9dcd883d93cbf39a90d9c434c746d19e (diff)
parent6cff6dd8b863e340851a9ec9a559881ea9520688 (diff)
downloadgo-tangerine-125bdc325352823bcf83a1a671a0bfaea1d7d7ff.tar
go-tangerine-125bdc325352823bcf83a1a671a0bfaea1d7d7ff.tar.gz
go-tangerine-125bdc325352823bcf83a1a671a0bfaea1d7d7ff.tar.bz2
go-tangerine-125bdc325352823bcf83a1a671a0bfaea1d7d7ff.tar.lz
go-tangerine-125bdc325352823bcf83a1a671a0bfaea1d7d7ff.tar.xz
go-tangerine-125bdc325352823bcf83a1a671a0bfaea1d7d7ff.tar.zst
go-tangerine-125bdc325352823bcf83a1a671a0bfaea1d7d7ff.zip
Merge branch 'develop' into poc8
Conflicts: cmd/ethereum/flags.go
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethereum/flags.go2
-rw-r--r--cmd/ethereum/main.go2
-rw-r--r--cmd/mist/assets/qml/main.qml8
-rw-r--r--cmd/mist/flags.go2
-rw-r--r--cmd/mist/main.go2
5 files changed, 8 insertions, 8 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go
index 556735491..72f1db458 100644
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@@ -87,7 +87,7 @@ func Init() {
flag.StringVar(&OutboundPort, "port", "30303", "listening port")
flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP")
- flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
+ flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index da09e0b58..fff9aedf8 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.9"
+ Version = "0.7.10"
)
var clilogger = logger.NewLogger("CLI")
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 285757080..65cea439a 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -787,8 +787,8 @@ ApplicationWindow {
title: "About"
minimumWidth: 350
maximumWidth: 350
- maximumHeight: 200
- minimumHeight: 200
+ maximumHeight: 280
+ minimumHeight: 280
Image {
id: aboutIcon
@@ -798,7 +798,7 @@ ApplicationWindow {
smooth: true
source: "../facet.png"
x: 10
- y: 10
+ y: 30
}
Text {
@@ -807,7 +807,7 @@ ApplicationWindow {
anchors.top: parent.top
anchors.topMargin: 30
font.pointSize: 12
- text: "<h2>Mist (0.6.5)</h2><h4>Amalthea</h4><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br><h3>Building</h3>Maran Hidskes"
+ text: "<h2>Mist (0.7.10)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br><h3>UX</h3>Alex van de Sande<br>"
}
}
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index 1d77532d9..fcee28f19 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -106,7 +106,7 @@ func Init() {
flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
flag.StringVar(&OutboundPort, "port", "30303", "listening port")
flag.BoolVar(&UseUPnP, "upnp", true, "enable UPnP support")
- flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
+ flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 3ea6e8e91..72e77940d 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -31,7 +31,7 @@ import (
const (
ClientIdentifier = "Mist"
- Version = "0.7.9"
+ Version = "0.7.10"
)
var ethereum *eth.Ethereum