aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-06-20 06:47:59 +0800
committerobscuren <geffobscura@gmail.com>2014-06-20 06:47:59 +0800
commitf63f3853bbf13b3f4cb983d25b70276ae283d0cc (patch)
tree6ef2ddd9ff6bff930e48368e7ccb442de9ca7f9e
parent09f37bd0235198145974db6430da0c429d2a0e79 (diff)
parent7ad073fb30e92689942d938939223bd01cb5fe38 (diff)
downloadgo-tangerine-f63f3853bbf13b3f4cb983d25b70276ae283d0cc.tar.gz
go-tangerine-f63f3853bbf13b3f4cb983d25b70276ae283d0cc.tar.zst
go-tangerine-f63f3853bbf13b3f4cb983d25b70276ae283d0cc.zip
Merge branch 'release/0.5.14' into develop
-rw-r--r--README.md2
-rw-r--r--ethutil/config.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 4a835afbf..dda1e3a83 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Ethereum
Ethereum Go Development package (C) Jeffrey Wilcke
Ethereum is currently in its testing phase. The current state is "Proof
-of Concept 5.0 RC13". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)).
+of Concept 5.0 RC14". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)).
Ethereum Go is split up in several sub packages Please refer to each
individual package for more information.
diff --git a/ethutil/config.go b/ethutil/config.go
index a24c39bfe..a573e108b 100644
--- a/ethutil/config.go
+++ b/ethutil/config.go
@@ -75,7 +75,7 @@ func ReadConfig(base string, logTypes LoggerType, g *globalconf.GlobalConf, id s
if Config == nil {
path := ApplicationFolder(base)
- Config = &config{ExecPath: path, Debug: true, Ver: "0.5.13"}
+ Config = &config{ExecPath: path, Debug: true, Ver: "0.5.14"}
Config.conf = g
Config.Identifier = id
Config.Log = NewLogger(logTypes, LogLevelDebug)