Merge branch 'dev' into refactoring/android
This commit is contained in:
commit
c8d2399db9
69 changed files with 5605 additions and 753 deletions
|
@ -79,8 +79,6 @@ signals:
|
|||
|
||||
void serviceIsNotReady();
|
||||
|
||||
void newVpnConfigurationCreated();
|
||||
|
||||
protected slots:
|
||||
void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
|
||||
void onConnectionStateChanged(Vpn::ConnectionState state);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue