Merge branch 'master' into eosc

2018-09-08 11:40:14 -04:00
parent c632e70214 a0ab013c09
commit ac504a3ddb
10 changed files with 17 additions and 2 deletions
--- a/src_genericwallet/chainConfig.h
+++ b/src_genericwallet/chainConfig.h
@@ -22,6 +22,7 @@ typedef enum chain_kind_e {
 	CHAIN_KIND_ETHER1,
 	CHAIN_KIND_ETHERGEM,
 	CHAIN_KIND_ATHEIOS,
+	CHAIN_KIND_GOCHAIN,
 	CHAIN_KIND_EOSCLASSIC
 } chain_kind_t;