diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-21 07:43:31 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-21 07:43:31 +0800 |
| commit | bc541b918ca66ff3ac75e02a299701eac7472623 (patch) | |
| tree | 1801c567d45d3656d4a66d93c80ab50d3d4c7a22 | |
| parent | f9663b8f4f0af5dd456c3dd9682d86912091204b (diff) | |
| parent | 92337baa5a51f4d4ec39cb5004bdcc4b07d321e0 (diff) | |
| download | go-tangerine-bc541b918ca66ff3ac75e02a299701eac7472623.tar.gz go-tangerine-bc541b918ca66ff3ac75e02a299701eac7472623.tar.zst go-tangerine-bc541b918ca66ff3ac75e02a299701eac7472623.zip | |
Merge branch 'release/0.8.4' into develop
| -rw-r--r-- | cmd/ethereum/main.go | 2 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 2 | ||||
| -rw-r--r-- | cmd/mist/main.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index fcf7f8ef0..53a558a99 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -37,7 +37,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.9.0" + Version = "0.8.4" ) var clilogger = logger.NewLogger("CLI") diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index c421d696c..ca37dbf3c 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -964,7 +964,7 @@ ApplicationWindow { anchors.top: parent.top anchors.topMargin: 30 font.pointSize: 12 - text: "<h2>Mist (0.9.0)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller" + text: "<h2>Mist (0.8.4)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller" } } diff --git a/cmd/mist/main.go b/cmd/mist/main.go index c7152347d..45eddeb28 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -36,7 +36,7 @@ import ( const ( ClientIdentifier = "Mist" - Version = "0.9.0" + Version = "0.8.4" ) var ethereum *eth.Ethereum |