Merge branch 'master' of github.com-obscure:ethereum/eth-go

This commit is contained in:
obscuren 2014-06-27 00:17:15 +02:00
commit 8151858e70

@ -44,7 +44,7 @@ func ReadConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix
} else { } else {
g.ParseAll() g.ParseAll()
} }
Config = &config{ExecPath: Datadir, Debug: true, Ver: "0.5.14", conf: g, Identifier: Identifier} Config = &config{ExecPath: Datadir, Debug: true, Ver: "0.5.15", conf: g, Identifier: Identifier}
Config.SetClientString("Ethereum(G)") Config.SetClientString("Ethereum(G)")
} }
return Config return Config