Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

This commit is contained in:
obscuren 2014-03-01 19:53:24 +01:00
commit 570ab249b3

@ -5,8 +5,7 @@ Ethereum
Ethereum Go Client (c) Jeffrey Wilcke Ethereum Go Client (c) Jeffrey Wilcke
The current state is "Proof of Concept 3". For build instructions see The current state is "Proof of Concept 3".
the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Edge).
For the development Go Package please see [eth-go package](https://github.com/ethereum/eth-go). For the development Go Package please see [eth-go package](https://github.com/ethereum/eth-go).