4 commits

Author	SHA1	Message	Date
Christopher Franko	5822644626	Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9	2017-03-26 11:40:56 -04:00
Felix Lange	c213fd1fd8	all: import "context" instead of "golang.org/x/net/context" ... There is no need to depend on the old context package now that the minimum Go version is 1.7. The move to "context" eliminates our weird vendoring setup. Some vendored code still uses golang.org/x/net/context and it is now vendored in the normal way. This change triggered new vet checks around context.WithTimeout which didn't fire with golang.org/x/net/context.	2017-03-22 20:49:15 +01:00
Christopher Franko	57638f70e6	Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9	2017-02-15 13:21:31 -05:00
Péter Szilágyi	178da7c6a9	mobile: initial wrappers for mobile support	2016-11-14 17:56:58 +02:00