6 commits

Author	SHA1	Message	Date
Christopher Franko	a85150f0b4	upstream merge continued	2017-03-26 12:08:39 -04:00
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	d0eba23af3	all: disable log message colors outside of geth ... Also tweak behaviour so colors are only enabled when stderr is a terminal.	2017-02-27 15:33:12 +01:00
Péter Szilágyi	d4fd06c3dc	all: blidly swap out glog to our log15, logs need rework	2017-02-23 12:16:44 +02:00
Christopher Franko	57638f70e6	Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9	2017-02-15 13:21:31 -05:00
Guillaume NICOLAS	bd06091874	mobile: add SetVerbosity (#3492)	2017-01-02 18:12:31 +01:00