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
..
assets/acl	Android shadowsocks code added	2022-04-01 10:05:58 +05:30
gradle/wrapper	Revert of Gradle upgrade	2023-01-17 16:12:42 +03:00
lib	Shadowsocks added as a library folder in android	2022-04-16 20:18:27 +05:30
res	Moving to Qt6:	2022-12-23 17:32:20 +03:00
schemas	Android shadowsocks code added	2022-04-01 10:05:58 +05:30
shadowsocks	Revert "Shadowsocks manifest fix"	2023-01-17 16:09:06 +03:00
src	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
wireguard	Fixes for android and wg	2021-10-01 12:18:48 -07:00
AndroidManifest.xml	1) Fixed theme	2022-12-26 14:00:45 +03:00
build.gradle	Revert of Gradle upgrade	2023-01-17 16:12:42 +03:00
gradle.properties	Cleanup	2022-08-09 17:06:03 +03:00
gradlew	Shadowsocks open source code added	2022-03-17 11:38:48 +05:30
gradlew.bat	Botan switched to amalgamation build	2021-08-08 18:10:09 +03:00
settings.gradle	Shadowsocks added as a library folder in android	2022-04-16 20:18:27 +05:30