andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter

Browse Source 
# Conflicts:
#	client/platforms/android/android_controller.cpp
#	client/platforms/android/android_controller.h
This commit is contained in:
Dmitriy Karpushin
2023-01-19 14:09:12 +03:00
parent 54dc363231 92374966fb
commit 39736e865e
255 changed files with 4322 additions and 7218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnconnection.cpp
+2 -2
View File
@@ -19,7 +19,7 @@
#endif
#ifdef Q_OS_ANDROID
#include "android_controller.h"
#include "../../platforms/android/android_controller.h"
#include "protocols/android_vpnprotocol.h"
#endif
@@ -27,7 +27,7 @@
#include <protocols/ios_vpnprotocol.h>
#endif
#include "utils.h"
#include "utilities.h"
#include "vpnconnection.h"
VpnConnection::VpnConnection(std::shared_ptr<Settings> settings,