aboutsummaryrefslogtreecommitdiffstats
path: root/xeth/state.go
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-261-0/+33
Conflicts: accounts/account_manager.go