Felix Lange 9bf513e993 Merge ethereum/poc-9 into accounts-integration ... Conflicts: cmd/utils/cmd.go cmd/utils/flags.go core/manager.go eth/backend.go rpc/http/server.go xeth/xeth.go		2015-03-09 23:25:46 +01:00
..
js.go	Updated xeth instances to take extra param for ui.Interface	2015-03-09 13:50:05 +01:00
main.go	Merge ethereum/poc-9 into accounts-integration	2015-03-09 23:25:46 +01:00