aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-06-10 04:24:13 +0800
committerobscuren <geffobscura@gmail.com>2014-06-10 04:24:13 +0800
commitd8339fa29a884516166993a6d29caed59f32ca1b (patch)
tree4057b75df6d269764d4e666561ea8b655836a372
parentc7d1924c344535c2d54265728bc2aa429215e595 (diff)
parenta51dfe89c05cc12b4a8483f683ff9f49b3a8f1bd (diff)
downloaddexon-d8339fa29a884516166993a6d29caed59f32ca1b.tar
dexon-d8339fa29a884516166993a6d29caed59f32ca1b.tar.gz
dexon-d8339fa29a884516166993a6d29caed59f32ca1b.tar.bz2
dexon-d8339fa29a884516166993a6d29caed59f32ca1b.tar.lz
dexon-d8339fa29a884516166993a6d29caed59f32ca1b.tar.xz
dexon-d8339fa29a884516166993a6d29caed59f32ca1b.tar.zst
dexon-d8339fa29a884516166993a6d29caed59f32ca1b.zip
Merge branch 'release/poc5-rc12' 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 8190c5f2d..b10a04c25 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 RC11". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)).
+of Concept 5.0 RC12". 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 4f7820eed..e992bda12 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.0 RC11"}
+ Config = &config{ExecPath: path, Debug: true, Ver: "0.5.0 RC12"}
Config.conf = g
Config.Identifier = id
Config.Log = NewLogger(logTypes, LogLevelDebug)