AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 39736e865e
255 changed files with 4322 additions and 7218 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/protocols/ios_vpnprotocol.mm
View file

@ -10,10 +10,12 @@
#include <QByteArray>
#include "ipaddressrange.h"
#include "platforms/ios/ipaddressrange.h"
#include "ios_vpnprotocol.h"
#include "core/errorstrings.h"
#include "AmneziaVPN-Swift.h"
#include "UIKit/UIKit.h"
namespace
{