Commit Graph

27792 Commits

Author SHA1 Message Date
jl777
2acb4fb5c5 Merge branch 'FSM' into jl777 2019-06-14 02:12:32 -11:00
jl777
9f07adc526 Merge branch 'dev' into FSM 2019-06-14 02:11:03 -11:00
jl777
dff05f9bca Merge branch 'beta' into dev 2019-06-14 02:10:29 -11:00
jl777
0d0fd8f068 Merge pull request #1564 from Alrighttt/beta
add heir CC to CCL exception
2019-06-14 02:09:27 -11:00
Alrighttt
d33d83ee73 remove whitespace 2019-06-14 14:46:49 +02:00
Alrighttt
caaca06a8f leave Heir CC activated on CCL 2019-06-14 14:41:04 +02:00
Alrighttt
ada1e20346 Merge pull request #3 from jl777/beta
Beta
2019-06-14 14:33:25 +02:00
jl777
2cb1643c78 Merge branch 'FSM' into jl777 2019-06-12 14:55:54 -11:00
jl777
56f7127d9d Merge branch 'dev' into FSM 2019-06-12 14:55:11 -11:00
jl777
01995176e7 Merge branch 'FSM' into jl777 2019-06-12 14:54:23 -11:00
jl777
5bf69b173f Merge pull request #1561 from jl777/dev
undo constraint
2019-06-12 14:53:34 -11:00
jl777
d2015647d0 undo constraint 2019-06-12 14:52:51 -11:00
jl777
96f4c3ac2f Merge pull request #1559 from jl777/dev
Dev
2019-06-12 01:59:01 -11:00
jl777
494e6d26d7 Merge branch 'beta' into dev 2019-06-12 01:57:20 -11:00
jl777
b8382256eb Merge pull request #1558 from jl777/FSM
FSM
2019-06-12 01:54:25 -11:00
jl777
5fcd794959 Merge pull request #1557 from jl777/jl777
Jl777
2019-06-12 01:53:37 -11:00
jl777
83df0ac891 Merge pull request #1556 from jl777/kolo-jl
dev
2019-06-12 01:52:55 -11:00
Mihail Fedorov
2984a80f2e dev 2019-06-12 15:46:57 +03:00
jl777
be8d76f793 Merge pull request #1555 from pungotoken/beta
pungocloud: new pubkeys for AR&SH NNs
2019-06-11 22:48:25 -11:00
pungotoken
79e06a9d85 pungocloud: new pubkeys for AR&SH NNs 2019-06-12 12:40:25 +03:00
jl777
ce787171b9 Merge branch 'FSM' into jl777 2019-06-11 18:32:35 -11:00
jl777
de88148df9 Merge branch 'dev' into FSM 2019-06-11 18:32:14 -11:00
jl777
1a8860853a Merge branch 'beta' into dev 2019-06-11 18:31:45 -11:00
jl777
1dbac16cac Merge pull request #1552 from blackjok3rtt/beta
change blackjok3r_SH pubkeys
2019-06-11 18:31:18 -11:00
blackjok3r
1d4e09a5c4 change blackjok3r_SH pubkeys 2019-06-12 12:16:13 +08:00
jl777
99dfd5b3c9 Support CHIPS 2019-06-11 01:35:49 -11:00
jl777
679bbcf234 Support CHIPS in smartdust 2019-06-11 00:48:17 -11:00
jl777
f66d97ee6d Merge pull request #1551 from jl777/dev
Dev
2019-06-11 00:35:08 -11:00
jl777
8ffc8a34da Merge pull request #1550 from jl777/FSM
FSM
2019-06-11 00:28:57 -11:00
jl777
6492296778 Merge pull request #1549 from jl777/jl777
Jl777
2019-06-11 00:28:33 -11:00
jl777
25d6cd8edd Fix offset 2019-06-11 00:27:51 -11:00
jl777
bdc06b1b37 Merge branch 'FSM' into jl777 2019-06-10 20:15:48 -11:00
jl777
f24ef298e3 Merge branch 'dev' into FSM 2019-06-10 20:15:24 -11:00
jl777
ee0a8ded42 Merge pull request #1548 from jl777/dev
Dev
2019-06-10 20:15:00 -11:00
jl777
c65c69fd13 Merge pull request #1547 from KomodoPlatform/dev
fix multi OS build
2019-06-10 20:14:32 -11:00
jl777
4bd0cb81c1 Merge pull request #1546 from jl777/dev
Merge branch 'beta' into dev
2019-06-10 19:05:18 -11:00
jl777
05011900b7 Merge pull request #1545 from jl777/FSM
FSM
2019-06-10 19:04:52 -11:00
jl777
206ae31734 Merge pull request #1544 from jl777/jl777
Jl777
2019-06-10 19:04:25 -11:00
jl777
8906371a9b Merge pull request #1543 from jl777/kolo-jl
dev
2019-06-10 19:02:48 -11:00
ca333
19eba8e2ad add wget and fetch-params 2019-06-10 22:57:57 +02:00
Mihail Fedorov
086b9c7177 dev 2019-06-10 23:32:12 +03:00
ca333
adfea602f9 rm /n 2019-06-10 21:52:18 +02:00
ca333
14421b7097 update gitlab 2019-06-10 21:24:17 +02:00
ca333
87a8498961 fix WIN 2019-06-10 20:52:44 +02:00
ca333
962d885e31 fix win 2019-06-10 20:31:24 +02:00
ca333
150fc74430 chmod 2019-06-10 20:25:08 +02:00
ca333
8baa169073 use makefilecustom for OSX 2019-06-10 19:44:30 +02:00
ca333
e6a2ca7b6c fix WIN 2019-06-10 19:33:20 +02:00
ca333
1fa0949050 add customcc makefile 2019-06-10 19:31:51 +02:00
ca333
6498968970 Merge pull request #175 from jl777/dev
synd dev
2019-06-10 18:56:46 +02:00