tendermint/node
Ethan Buchman f347143b3d Merge branch 'master' into develop
Conflicts:
	cmd/tendermint/flags.go
	glide.lock
	glide.yaml
	node/node.go
	rpc/core/routes.go
	version/version.go
2017-01-12 20:48:10 -05:00
..
id.go Bare consensus refactor 2015-11-01 11:34:08 -08:00
log.go Refactor to move common libraries out of project 2015-10-22 17:39:06 -07:00
node.go Merge branch 'master' into develop 2017-01-12 20:48:10 -05:00
node_test.go proxy: NewAppConns takes a NewTMSPClient func 2016-09-09 23:55:24 -04:00