Merge branch 'dev' into ios_main

This commit is contained in:
pokamest
2021-11-22 00:08:34 -08:00
19 changed files with 168 additions and 89 deletions
+2
View File
@@ -30,6 +30,7 @@ HEADERS += \
core/errorstrings.h \
core/ipcclient.h \
configurators/openvpn_configurator.h \
core/privileged_process.h \
core/scripts_registry.h \
core/server_defs.h \
core/servercontroller.h \
@@ -84,6 +85,7 @@ SOURCES += \
core/errorstrings.cpp \
core/ipcclient.cpp \
configurators/openvpn_configurator.cpp \
core/privileged_process.cpp \
core/scripts_registry.cpp \
core/server_defs.cpp \
core/servercontroller.cpp \