DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'jl777' into FSM

Browse Source 
# Conflicts:
#	src/cc/CCinclude.h
This commit is contained in:
jl777
2018-08-24 00:40:04 -11:00
parent 90c811557b dcdb45372d
commit cccd779df5
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cc/CCinclude.h
View File

@@ -49,7 +49,10 @@ one other technical note is that komodod has the insight-explorer extensions bui
#include <exception>
extern int32_t KOMODO_CONNECTING,KOMODO_CCACTIVATE;
<<<<<<< HEAD
extern uint32_t ASSETCHAINS_CC;
=======
>>>>>>> jl777
#define SMALLVAL 0.000000000000001
union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };