Dmitriy Karpushin 39736e865e Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter ... # Conflicts: # client/platforms/android/android_controller.cpp # client/platforms/android/android_controller.h		2023-01-19 14:09:12 +03:00
..
android_vpnprotocol.cpp	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
android_vpnprotocol.h	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
ikev2_vpn_protocol_windows.cpp	Merge branch 'dev' into qt_migration	2022-10-15 19:46:26 +03:00
ikev2_vpn_protocol_windows.h	IKEv2 class file renamed	2021-12-21 02:57:23 +03:00
ios_vpnprotocol.h	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
ios_vpnprotocol.mm	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
openvpnovercloakprotocol.cpp	Merge branch 'dev' into qt_migration	2022-10-15 19:46:26 +03:00
openvpnovercloakprotocol.h	ios fixes	2021-09-15 08:03:28 -07:00
openvpnprotocol.cpp	Merge branch 'dev' into qt_migration	2022-10-15 19:46:26 +03:00
openvpnprotocol.h	Select random management port	2022-08-29 02:58:23 +03:00
protocols_defs.cpp	Wordpress site in the Tor network	2022-07-30 16:20:41 +03:00
protocols_defs.h	added display of wireguard configs, such a config will be displayed as raw text	2022-11-04 23:31:39 +03:00
shadowsocksvpnprotocol.cpp	Merge branch 'dev' into qt_migration	2022-10-15 19:46:26 +03:00
shadowsocksvpnprotocol.h	ios fixes	2021-09-15 08:03:28 -07:00
vpnprotocol.cpp	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
vpnprotocol.h	Merge branch 'dev' into ios-wireguard	2021-11-30 21:51:06 +03:00
wireguardprotocol.cpp	Merge branch 'dev' into qt_migration	2022-10-15 19:46:26 +03:00
wireguardprotocol.h	IpcServerProcess permit list	2022-08-10 22:15:00 +03:00