4 commits

Author	SHA1	Message	Date
Julian Yap	845e64b5c3	Merge remote-tracking branch 'upstream/release/1.7' into release/2.2	2019-03-08 17:06:30 -08:00
Julian Yap	fabeb277ae	Merge remote-tracking branch 'upstream/release/1.6' into release/2.1	2019-02-21 17:18:29 -08:00
Julian Yap	46e448a027	Implement UIP1 hard fork. Replace Ethash with Ubqhash	2018-10-19 01:24:57 -07:00
Julian Yap	0623c74136	Merge remote-tracking branch 'upstream/master'	2016-12-02 21:42:57 -10:00