Commit Graph

23220 Commits

Author SHA1 Message Date
blackjok3rtt
b97f4e091e fix 100% PoS chain (#1332) 2019-03-13 21:47:09 -11:00
jl777
9ca1eb8543 Merge pull request #1250 from chainmakers/beta
Add Ilien
2019-02-14 21:23:44 -11:00
Your Name
8702ec8130 new file: ac/ilien
new file:   fiat/ilien
2019-02-14 22:34:38 +00:00
Your Name
2933c4d2a9 modified: assetchains.json
modified:   assetchains.old
2019-02-14 22:08:20 +00:00
siulynot
bc416d79e2 Merge pull request #5 from jl777/beta
Beta
2019-02-14 17:37:49 -04:00
jl777
df597cf8ae Merge pull request #1237 from jl777/dev
SEC and MGNX exemption
2019-02-11 02:31:14 -11:00
jl777
e8b7963356 SEC and MGNX exemption 2019-02-11 02:30:21 -11:00
jl777
e7f7495492 Merge pull request #1218 from jl777/dev
Dev
2019-01-27 04:53:59 -11:00
jl777
a8ea6eb7ea Merge pull request #1217 from jl777/FSM
FSM
2019-01-27 04:53:12 -11:00
jl777
76024c356e Merge pull request #1216 from jl777/jl777
Disable removeorphan
2019-01-27 04:52:32 -11:00
jl777
fbd07edee2 Disable removeorphan 2019-01-27 04:51:48 -11:00
jl777
c27493d9ac Merge pull request #1213 from jl777/dev
Dev
2019-01-26 01:31:13 -11:00
jl777
57f6fd813a Merge pull request #1212 from jl777/FSM
FSM
2019-01-26 01:30:36 -11:00
jl777
f5ac1e19d9 Merge pull request #1211 from jl777/jl777
Jl777
2019-01-26 01:29:35 -11:00
jl777
9484ddf59b Merge pull request #1210 from KomodoPlatform/cclib_dyn
update linux makefile
2019-01-26 01:28:16 -11:00
ca333
25965a5307 Merge pull request #124 from jl777/jl777
sync cclib_dyn->jl777:jl777
2019-01-26 13:11:17 +01:00
ca333
18f8c77197 update linux makefile 2019-01-26 13:09:27 +01:00
ca333
fe4b34e9e3 add linux headers 2019-01-26 13:08:29 +01:00
jl777
7c81fe3200 Merge pull request #1209 from jl777/dev
Dev
2019-01-25 17:20:22 -11:00
jl777
c990c403b3 Merge pull request #1208 from jl777/FSM
FSM
2019-01-25 17:19:11 -11:00
jl777
b778dbef8e Merge pull request #1207 from jl777/jl777
Jl777
2019-01-25 17:16:59 -11:00
jl777
932b358243 +comments how to update to 8MB blocks 2019-01-25 17:15:56 -11:00
jl777
352c93f2c4 -<<<<< HEAD 2019-01-25 16:59:55 -11:00
jl777
61821dd51a Merge branch 'FSM' into jl777 2019-01-25 16:54:51 -11:00
jl777
91f213c4b8 +// 2019-01-25 16:54:42 -11:00
jl777
1231c3240d Merge remote-tracking branch 'origin/FSM' into FSM
# Conflicts:
#	src/cc/CCtx.cpp
2019-01-25 16:45:19 -11:00
jl777
524342f7ba Single #define _MAX_BLOCK_SIZE to set max block size 2019-01-25 16:43:57 -11:00
jl777
fc515c1f4a Merge pull request #1206 from DeckerSU/patch-gcc-8
Patch gcc 8
2019-01-25 16:37:17 -11:00
jl777
e4791f54e6 Merge branch 'FSM' into patch-gcc-8 2019-01-25 16:33:13 -11:00
DeckerSU
52cfb02f40 komodo_activate_sapling return value fix 2019-01-26 04:21:55 +03:00
DeckerSU
a6e7da55e2 fix gcc-8 / g++-8 build 2019-01-26 03:09:54 +03:00
jl777
6f28b46ba6 Merge pull request #1205 from jl777/dev
Dev
2019-01-25 01:31:12 -11:00
jl777
8fdb3ea055 Merge pull request #1204 from jl777/FSM
set nonz = 0
2019-01-25 01:29:33 -11:00
jl777
3ea404eaf3 Merge pull request #1203 from jl777/jl777
Jl777
2019-01-25 01:28:50 -11:00
jl777
07a05ccd6b -print 2019-01-25 01:27:55 -11:00
jl777
a268218d11 Nonz = 0 2019-01-25 01:24:33 -11:00
jl777
2246cd0c55 Nonz = 0 2019-01-25 01:24:05 -11:00
jl777
9dda24f913 set nonz = 0 2019-01-25 01:23:36 -11:00
jl777
b4a9c7e504 Init nonz 2019-01-25 00:57:40 -11:00
jl777
d336a9276c Merge pull request #1201 from jl777/kolo
OUR asset
2019-01-24 19:50:35 -11:00
jl777
e5ab582a33 Merge pull request #1202 from jl777/dev
Dev
2019-01-24 19:48:46 -11:00
Mihail Fedorov
ebf84f3055 OUR asset 2019-01-25 01:54:33 +03:00
Mihail Fedorov
9bc086de8e OUR asset 2019-01-25 01:52:45 +03:00
Mihail Fedorov
03130a6856 OUR asset 2019-01-25 01:52:24 +03:00
jl777
9370bdbe16 Merge pull request #1179 from jl777/FSM
FSM
2019-01-24 05:09:36 -11:00
jl777
1b53f34527 Use tmp 2019-01-24 04:18:54 -11:00
jl777
ed73fd8423 Undo tmpfile 2019-01-24 04:16:01 -11:00
jl777
d682dfd830 +print 2019-01-24 03:42:27 -11:00
jl777
d797bce94d Test 2019-01-24 03:34:10 -11:00
jl777
10b7fff5bc Static 2019-01-24 03:32:22 -11:00