Commit Graph
100 Commits
Author SHA1 Message Date
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
jl777 a143f3720d Merge pull request #332 from jl777/dev
Dev
2017-03-22 11:22:10 +02:00
jl777 07fe28167d Merge pull request #331 from jl777/dPoW
DPoW
2017-03-22 08:01:04 +02:00
jl777 829452dec4 Merge pull request #330 from jl777/beta
Beta
2017-03-22 08:00:27 +02:00
jl777 0c274946e3 Merge pull request #329 from jl777/dev
Dev
2017-03-22 07:56:10 +02:00
jl777 6c27240fb6 Merge pull request #328 from jl777/dPoW
DPoW
2017-03-22 06:09:51 +02:00
jl777 0e32d09652 Merge pull request #327 from jl777/beta
Beta
2017-03-22 06:08:57 +02:00
jl777 f5be2a590c Merge pull request #326 from jl777/dev
Shrink grandfather window
2017-03-22 06:07:54 +02:00
jl777 41ac5a72ea Merge pull request #323 from jl777/dPoW
DPoW
2017-03-21 22:15:47 +02:00
jl777 54b61484f9 Merge pull request #322 from jl777/beta
Beta
2017-03-21 22:14:27 +02:00
jl777 b689e24c70 Merge pull request #321 from jl777/dev
Dev
2017-03-21 22:02:28 +02:00
jl777 a0e9124b73 Merge pull request #318 from jl777/dev
Dev
2017-03-19 00:37:04 +02:00
jl777 86774a6c33 Merge pull request #317 from jl777/dev
Dev
2017-03-18 17:01:06 +02:00
jl777 f15c1bb1e7 Merge pull request #314 from jl777/dPoW
DPoW
2017-03-18 13:39:23 +02:00
jl777 7efc3ca172 Merge pull request #313 from jl777/beta
Beta
2017-03-18 13:38:13 +02:00
jl777 a5f3ea4da3 Merge pull request #312 from jl777/dev
Test
2017-03-18 13:29:14 +02:00
jl777 e7c206ce84 Merge pull request #311 from jl777/dev
Dev
2017-03-18 13:24:05 +02:00
jl777 eb8edd119a Merge pull request #310 from jl777/dev
Dev
2017-03-18 12:58:00 +02:00
jl777 98cb001c52 Merge pull request #309 from jl777/dev
Dev
2017-03-18 10:52:36 +02:00
jl777 dd256fac4e Merge pull request #308 from jl777/dPoW
DPoW
2017-03-18 09:48:24 +02:00
jl777 921059cb03 Merge pull request #307 from jl777/beta
Beta
2017-03-18 09:47:44 +02:00
jl777 b48c1f1d0d Merge pull request #306 from jl777/dev
Dev
2017-03-18 09:40:45 +02:00
jl777 edeb16ae6d Merge pull request #303 from jl777/dPoW
DPoW
2017-03-17 20:05:25 +02:00
jl777 462cac0220 Merge pull request #302 from jl777/beta
Beta
2017-03-17 19:00:37 +02:00
jl777 f9f1ce1bc4 Merge pull request #301 from jl777/dev
Test
2017-03-17 18:51:26 +02:00
jl777 f72ce93f66 Merge pull request #300 from jl777/dev
Test
2017-03-17 18:27:55 +02:00
jl777 e33f01aba6 Merge pull request #299 from jl777/dev
Test
2017-03-17 18:19:22 +02:00
jl777 6ef472f7ee Merge branch 'beta' into dev 2017-03-17 18:19:16 +02:00
jl777 8c0fcef59b Merge pull request #298 from jl777/dev
Touch
2017-03-17 18:16:08 +02:00
jl777 98b0f4cd90 Merge pull request #297 from jl777/dev
Remove print
2017-03-17 18:03:59 +02:00
jl777 25a3e25da8 Merge pull request #296 from jl777/dev
Dev
2017-03-17 17:25:16 +02:00
jl777 628e0bfe14 Merge pull request #293 from jl777/dev
Test
2017-03-17 13:47:49 +02:00
jl777 0ce8ef227b Merge pull request #292 from jl777/dev
Test
2017-03-17 08:25:14 +02:00
jl777 317558d445 Merge pull request #291 from jl777/dev
disable redeems
2017-03-17 08:15:33 +02:00
jl777 196ed32f8d Merge pull request #290 from jl777/dev
Dev
2017-03-17 07:57:17 +02:00
jl777 4dfd322c8c Merge pull request #287 from jl777/dev
Dev
2017-03-17 02:20:13 +02:00
jl777 157080b7d1 Merge pull request #286 from jl777/dev
Test
2017-03-17 01:55:30 +02:00
jl777 cfee5e7f7c Merge pull request #285 from jl777/dev
Dev
2017-03-16 22:51:18 +02:00
jl777 9896fea5d7 Merge pull request #284 from jl777/dev
changes in interest calc to be active block 300000, no hurry to update
2017-03-16 20:32:17 +02:00
jl777 ea457f2552 Merge pull request #283 from jl777/dev
Dev
2017-03-16 20:05:13 +02:00
jl777 d6ab51d1af Merge pull request #280 from jl777/dPoW
DPoW
2017-03-16 16:50:50 +02:00
jl777 dbac4b61d4 Merge pull request #279 from jl777/beta
Beta
2017-03-16 16:50:20 +02:00
jl777 8b1e456d32 Merge pull request #278 from jl777/dev
Dev
2017-03-16 16:49:35 +02:00
jl777 f3658139a1 Merge pull request #275 from jl777/dPoW
DPoW
2017-03-16 08:48:24 +02:00
jl777 e9d403c71a Merge pull request #274 from jl777/beta
Beta
2017-03-16 08:47:54 +02:00
jl777 2533d8ade0 Merge pull request #273 from jl777/dev
Dev
2017-03-16 08:46:35 +02:00
jl777 018174cc85 Merge pull request #272 from jl777/dPoW
Syntax fix
2017-03-15 18:18:13 +02:00
jl777 049497d96e Merge pull request #271 from jl777/beta
Beta
2017-03-15 18:17:13 +02:00
jl777 229f934848 Merge pull request #270 from jl777/dev
Test
2017-03-15 15:31:34 +02:00
jl777 396b9d12e4 Merge pull request #269 from jl777/dev
Test
2017-03-15 10:57:00 +02:00
jl777 e9b84beb2b Merge pull request #268 from jl777/dev
Dev
2017-03-15 10:52:56 +02:00
jl777 68f495d1b5 Merge pull request #265 from jl777/dPoW
DPoW
2017-03-14 21:58:19 +02:00
jl777 b0f5be9f43 Merge pull request #264 from jl777/beta
Beta
2017-03-14 21:54:54 +02:00
jl777 534b5158b9 Merge pull request #263 from jl777/dev
Legacy combat
2017-03-14 21:54:25 +02:00
jl777 3b333f2e15 Merge pull request #262 from jl777/dPoW
DPoW
2017-03-14 21:36:56 +02:00