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

..

flags.go

Merge branch 'master' into develop

2017-01-12 20:48:10 -05:00

gen_validator.go

Pretty print JSON

2016-03-19 16:58:15 -07:00

init.go

remove INSTALL dir, add INSTALL.md, update DOCKER

2016-10-11 23:27:59 -04:00

log.go

Refactor to move common libraries out of project

2015-10-22 17:39:06 -07:00

main.go

cswal -> cs_wal_dir

2016-10-30 03:55:27 -07:00

probe_upnp.go

Refactor to move common libraries out of project

2015-10-22 17:39:06 -07:00

reset_priv_validator.go

cswal -> cs_wal_dir

2016-10-30 03:55:27 -07:00

show_validator.go

Pretty print JSON

2016-03-19 16:58:15 -07:00