aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-29 04:44:34 +0800
committerobscuren <geffobscura@gmail.com>2014-11-29 04:44:34 +0800
commit1bce02eff70db43b98d68fcd094fd2e15745b021 (patch)
treea69acb327b4f71d59b297ca778450c128dce85f8 /cmd
parent8cf9ed0ea588e97f2baf0f834248727e8fbca18f (diff)
parenta3559c5e1b469890bb8d71e9992175febaae31c7 (diff)
downloadgo-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar
go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.gz
go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.bz2
go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.lz
go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.xz
go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.zst
go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.zip
Fixed merge
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethereum/main.go3
-rw-r--r--cmd/mist/main.go2
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index aa933c4e7..c351167f2 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -21,6 +21,7 @@ import (
"fmt"
"os"
"runtime"
+
"github.com/ethereum/go-ethereum/chain/types"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/ethutil"
@@ -29,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.5"
+ Version = "0.7.6"
)
var clilogger = logger.NewLogger("CLI")
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index bc05d4f3d..39beeafdb 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -31,7 +31,7 @@ import (
const (
ClientIdentifier = "Mist"
- Version = "0.7.5"
+ Version = "0.7.6"
)
var ethereum *eth.Ethereum