Merge with sync sequoia_windows
authorThomas
Mon, 20 May 2019 14:50:00 +0200
branchsequoia_windows
changeset 373893bdc04f45da
parent 3733 3772373556a4
parent 3737 80bf2f5a285d
child 3746 9cae7b9305d1
Merge with sync
     1.1 --- a/sync/sync.fsm	Mon May 20 11:41:21 2019 +0200
     1.2 +++ b/sync/sync.fsm	Mon May 20 14:50:00 2019 +0200
     1.3 @@ -80,7 +80,7 @@
     1.4          }
     1.5  
     1.6          // handshaking without existing Device group
     1.7 -        state HandshakingNewFirst {
     1.8 +        state HandshakingNewFirst timeout=600 {
     1.9              on Init
    1.10                  do showSoleHandshake;
    1.11  
    1.12 @@ -118,7 +118,7 @@
    1.13          }
    1.14  
    1.15          // handshaking without existing Device group
    1.16 -        state HandshakingNewSecond {
    1.17 +        state HandshakingNewSecond timeout=600 {
    1.18              on Init
    1.19                  do showSoleHandshake;
    1.20