Commit Graph
100 Commits
Author SHA1 Message Date
jl777 58fbfec10c Merge pull request #494 from ca333/dev
dev update
2017-10-24 12:19:27 +03:00
jl777 70bd41b2be Merge pull request #493 from libscott/refactor_cjson
Upgrade cJSON and move customizations to komodo_cJSON (PR to dev)
2017-10-23 21:07:25 +03:00
jl777 4a4a29e788 Merge pull request #481 from ca333/dev
unibranch fix
2017-10-09 17:27:12 +03:00
jl777 965fbaf422 Merge pull request #479 from ca333/dev
universal build from ca333
2017-10-09 15:34:35 +03:00
jl777 2552250d89 Merge pull request #470 from SuperNETorg/dev
checksum fix
2017-09-18 23:30:11 +02:00
jl777 388d963ac4 Merge pull request #469 from jl777/dev
Test
2017-09-18 18:36:59 +02:00
jl777 0d73bf050f Merge pull request #468 from jl777/dev
Dev
2017-09-18 17:43:19 +02:00
jl777 c4a12d9618 Merge pull request #466 from jl777/dev
Dev
2017-09-07 12:54:38 +02:00
jl777 a6a269f7ad Merge pull request #463 from jl777/dev
Remove pax prints
2017-09-06 18:13:53 +02:00
jl777 2198f1cc19 Merge pull request #460 from jl777/dev
Test
2017-09-01 10:50:46 +02:00
jl777 a6c7e3a0d5 Merge pull request #459 from jl777/dev
Dev
2017-09-01 01:44:05 +02:00
jl777 79b44b4b7b Merge pull request #457 from jl777/dev
Dev
2017-08-26 15:27:27 +02:00
jl777 5b0d5d4a37 Merge pull request #453 from jl777/dev
Dev
2017-08-22 09:19:58 +02:00
jl777 43d805dc0c Merge pull request #451 from jl777/dev
JUMBLR
2017-07-18 08:46:33 +02:00
jl777 1552c52136 Merge pull request #450 from jl777/dev
Dev
2017-07-12 11:01:19 +03:00
jl777 9ba7735018 Merge pull request #448 from jl777/dev
fixes assetchains vout error
2017-07-03 18:30:22 +03:00
jl777 d71e908633 Merge pull request #447 from jl777/dev
Dev
2017-07-03 15:41:40 +03:00
jl777 da30ce6726 Merge pull request #446 from jl777/dev
Test
2017-07-02 23:13:55 +03:00
jl777 a2f5d3c9a3 Merge pull request #445 from jl777/dev
Dev
2017-07-01 19:47:31 +03:00
jl777 741658905f Merge pull request #444 from jl777/dev
Dev
2017-06-29 18:29:51 +03:00
jl777 91324023d8 Merge pull request #443 from jl777/dev
fix default volume for paxprice, doesnt affect consensus
2017-06-27 17:52:10 +03:00
jl777 1656934cb0 Merge pull request #442 from jl777/dev
Dev
2017-06-16 23:54:13 +03:00
jl777 de38adeac1 Merge pull request #438 from jl777/dev
Remove print
2017-06-04 20:11:45 +03:00
jl777 93ea92bcc3 Merge pull request #437 from jl777/dev
hotfix
2017-06-04 20:10:16 +03:00
jl777 8300e53a81 Merge pull request #436 from jl777/dev
Dev
2017-06-04 19:44:22 +03:00
jl777 0c74f7de58 Merge pull request #435 from jl777/dev
Dev
2017-06-03 23:28:10 +03:00
jl777 d9135e422f Merge pull request #432 from jl777/dev
Test
2017-05-23 10:41:07 +03:00
jl777 75f5f61211 Merge pull request #431 from jl777/dev
test
2017-05-23 10:37:58 +03:00
jl777 35d54ffd1a Merge pull request #430 from jl777/dev
Dev
2017-05-23 10:28:35 +03:00
jl777 35c052a8ca Merge pull request #424 from jl777/dev
Dev
2017-05-02 17:08:43 +03:00
jl777 5a3e1d41fa Merge pull request #421 from jl777/dev
new MESH
2017-04-27 13:43:40 +03:00
jl777 9ad4422c3d Merge pull request #420 from jl777/dev
new MESH
2017-04-27 11:07:10 +03:00
jl777 6ad5e10198 Merge pull request #419 from jl777/dev
Mesh crash test
2017-04-26 18:27:57 +03:00
jl777 8a7d6889f5 Merge pull request #418 from jl777/dev
Dev
2017-04-26 09:16:51 +03:00
jl777 854af15e28 Merge pull request #412 from jl777/dev
https://github.com/zcash/zcash/pull/2259/commits
2017-04-14 08:37:02 +03:00
jl777 21afe18407 Merge pull request #411 from jl777/dev
Test
2017-04-10 17:36:49 +03:00
jl777 3c4d6ebc6e Merge pull request #410 from jl777/dev
Dev
2017-04-10 15:47:06 +03:00
jl777 953cec090a Merge pull request #409 from jl777/dev
Dev
2017-04-08 16:45:05 +03:00
jl777 7afa0b34e0 Merge pull request #408 from jl777/1.0.8
1.0.8
2017-04-08 16:43:47 +03:00
jl777 38d0f59a7e Merge pull request #407 from jl777/dPoW
DPoW
2017-03-30 04:56:09 +03:00
jl777 8b987626d9 Merge pull request #393 from jl777/beta
Beta
2017-03-30 04:55:19 +03:00
jl777 757119510c Merge pull request #406 from jl777/dev
WLC
2017-03-27 10:50:11 +03:00
jl777 a82a09a24d Merge pull request #401 from jl777/dev
Test
2017-03-26 22:24:02 +03:00
jl777 b204db1786 Merge pull request #400 from jl777/dev
Dev
2017-03-26 22:08:58 +03:00
jl777 43fcd91460 Merge pull request #399 from jl777/dev
Test
2017-03-26 20:53:53 +03:00
jl777 d0849a5d7e Merge pull request #398 from jl777/dev
Test
2017-03-26 20:37:32 +03:00
jl777 cb02765591 Merge pull request #397 from jl777/dev
Test
2017-03-26 19:47:13 +03:00
jl777 2827ed9891 Merge pull request #396 from jl777/dev
Dev
2017-03-26 19:35:50 +03:00
jl777 d80c066d4b Merge pull request #395 from jl777/dev
Dev
2017-03-26 19:10:35 +03:00
jl777 c8a6759c48 Merge pull request #394 from jl777/dev
Test
2017-03-26 18:55:39 +03:00
jl777 0ebebba0e3 Merge pull request #392 from jl777/dev
April 5th activation of interest calc fix, along with more notarization getinfo data
2017-03-26 18:42:34 +03:00
jl777 c99dd13cb6 Merge pull request #391 from jl777/dev
April 5th activation
Interest calc fix for small utxo
2017-03-26 17:08:30 +03:00
jl777 554cdd83b3 Merge pull request #388 from jl777/dev
Test
2017-03-25 20:37:13 +02:00
jl777 e84c90f704 Merge pull request #387 from jl777/dev
Remove prints
2017-03-25 19:32:57 +02:00
jl777 e1fa9a2439 Merge pull request #386 from jl777/dPoW
DPoW
2017-03-25 19:08:42 +02:00
jl777 d074d6e14f Merge pull request #385 from jl777/beta
Beta
2017-03-25 19:07:55 +02:00
jl777 f8bb37565b Merge pull request #384 from jl777/dev
Dev
2017-03-25 19:07:14 +02:00
jl777 9e7efae331 Merge pull request #383 from jl777/dPoW
DPoW
2017-03-25 17:11:39 +02:00
jl777 276420b373 Merge pull request #382 from jl777/beta
Beta
2017-03-25 17:10:57 +02:00
jl777 1265e49f96 Merge pull request #379 from jl777/dev
Expand time window
2017-03-25 13:26:06 +02:00
jl777 9094724ab8 Merge pull request #378 from jl777/dev
Fix miner
2017-03-25 10:36:25 +02:00
jl777 1aff66e126 Merge pull request #377 from jl777/dev
Test
2017-03-25 10:28:59 +02:00
jl777 c17d8a33c9 Merge pull request #376 from jl777/dev
Disable updating template time
2017-03-25 02:10:22 +02:00
jl777 4334bb4dec Merge pull request #375 from jl777/dev
Test
2017-03-25 01:38:54 +02:00
jl777 e0a9732f61 Merge pull request #374 from jl777/dev
Dev
2017-03-25 01:19:27 +02:00
jl777 c987ffb5ed Merge pull request #373 from jl777/devtest
Devtest
2017-03-25 01:18:40 +02:00
jl777 c4e2082725 Merge pull request #372 from jl777/dev
Test
2017-03-24 07:42:03 +02:00
jl777 9f4f92837e Merge pull request #371 from jl777/dev
Dev
2017-03-24 07:24:29 +02:00
jl777 94a8c817ec Merge pull request #370 from jl777/dev
Dev
2017-03-24 06:46:37 +02:00
jl777 dcf8db6bb9 Merge pull request #369 from jl777/dev
Dev
2017-03-24 06:24:01 +02:00
jl777 524cb6a9af Merge pull request #368 from jl777/dev
Test
2017-03-24 05:45:56 +02:00
jl777 94c45e0fdb Merge pull request #367 from jl777/dev
247204
2017-03-24 05:31:07 +02:00
jl777 8f06490311 Merge pull request #366 from jl777/dev
Dev
2017-03-24 05:15:24 +02:00
jl777 aa17174ca3 Merge pull request #363 from jl777/dev
Dev
2017-03-24 04:40:26 +02:00
jl777 816fac6a7a Merge pull request #362 from jl777/dev
Dev
2017-03-24 04:26:18 +02:00
jl777 964adc2e26 Merge pull request #361 from jl777/dev
Dev
2017-03-23 22:16:28 +02:00
jl777 f59302b668 Merge pull request #360 from jl777/dev
Check against pblock->nTime
2017-03-23 20:54:36 +02:00
jl777 741b884ec6 Merge pull request #359 from jl777/dev
Dev
2017-03-23 20:48:48 +02:00
jl777 25d900ccd5 Merge pull request #358 from jl777/dev
Test
2017-03-23 18:37:56 +02:00
jl777 bf49cc6524 Merge pull request #357 from jl777/dev
Dev
2017-03-23 15:44:19 +02:00
jl777 7674e37ff8 Merge pull request #356 from jl777/dPoW
DPoW
2017-03-23 07:29:18 +02:00
jl777 58d2e02b85 Merge pull request #355 from jl777/beta
Beta
2017-03-23 07:28:42 +02:00
jl777 cf3fe7e69e Merge pull request #354 from jl777/dev
Post-fork with mining
2017-03-23 07:26:26 +02:00
jl777 bee549f5a6 Merge pull request #353 from jl777/dev
Dev
2017-03-23 06:54:04 +02:00
jl777 e9c0c24d5b Merge pull request #352 from jl777/dev
Test
2017-03-23 05:33:01 +02:00
jl777 aef232bc92 Merge pull request #351 from jl777/dev
Dev
2017-03-23 04:45:36 +02:00
jl777 087a12dd44 Merge pull request #350 from jl777/dev
Dev
2017-03-22 22:12:38 +02:00
jl777 f66fabc986 Merge pull request #347 from jl777/dev
Dev
2017-03-22 18:00:39 +02:00
jl777 52606383a6 Merge pull request #346 from jl777/dPoW
DPoW
2017-03-22 16:54:58 +02:00
jl777 203acef306 Merge pull request #345 from jl777/beta
Beta
2017-03-22 16:54:22 +02:00
jl777 39c3fe8c08 Merge pull request #344 from jl777/dev
Test
2017-03-22 16:26:04 +02:00
jl777 2448031d77 Merge pull request #343 from jl777/dev
Test
2017-03-22 16:09:02 +02:00
jl777 1021b3559a Merge pull request #342 from jl777/dev
Dev
2017-03-22 16:00:25 +02:00
jl777 620e887b1c Merge pull request #341 from jl777/dPoW
DPoW
2017-03-22 14:36:56 +02:00
jl777 61dd95a26c Merge pull request #340 from jl777/beta
Beta
2017-03-22 14:36:17 +02:00
jl777 373f2e0a95 Merge pull request #339 from jl777/dev
Synchronize to 60
2017-03-22 14:24:12 +02:00
jl777 ebdba58d9b Merge pull request #338 from jl777/dev
Remove prints
2017-03-22 14:22:58 +02:00
jl777 220b736c0c Merge pull request #337 from jl777/dev
Dev
2017-03-22 14:05:55 +02:00
jl777 3798d55fa6 Merge pull request #334 from jl777/dPoW
DPoW
2017-03-22 11:40:59 +02:00
jl777 fcb8fc1e0d Merge pull request #333 from jl777/beta
Beta
2017-03-22 11:40:25 +02:00