Commit Graph

203 Commits

Author SHA1 Message Date
Maran
6724d27c0c Merge master into miner branch 2014-03-24 10:26:19 +01:00
obscuren
fe79a8f724 Merge branch 'develop' of https://github.com/WeMeetAgain/go-ethereum into WeMeetAgain-develop
Conflicts:
	ethereal/Makefile
2014-03-22 11:32:01 +01:00
obscuren
1f2547b8a7 Major re-organisation.
The Ethereum node and Gui are now separated.
2014-03-22 01:02:24 +01:00