Commit Graph

205 Commits

Author SHA1 Message Date
obscuren
49ded3aa77 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
	accounts/account_manager.go
2015-02-26 12:06:01 +01:00
obscuren
5ab0eaa06d wip 2015-02-26 11:14:54 +01:00
Taylor Gerring
9e0ab22dd0 Stub defaultBlock methods 2015-02-25 09:57:49 +01:00
Taylor Gerring
2e3a6e2559 Consolidate related items 2015-02-24 19:54:18 +01:00
Taylor Gerring
43acad81b3 Rename files 2015-02-24 19:11:01 +01:00