Merge branch 'publictests' of github.com:ebuchman/go-ethereum into publictests

Conflicts:
	core/block_processor.go
	miner/worker.go
This commit is contained in:
Matthew Wampler-Doty 2015-03-04 15:38:03 -05:00
commit 470587eaa5

View file

@ -5,6 +5,7 @@ before_install:
- sudo add-apt-repository ppa:beineri/opt-qt541 -y
- sudo apt-get update -qq
- sudo apt-get install -yqq libgmp3-dev libreadline6-dev qt54quickcontrols qt54webengine
- go get github.com/ethereum/ethash/go-ethash
install:
# - go get code.google.com/p/go.tools/cmd/goimports
# - go get github.com/golang/lint/golint