Merge branch 'dev' into feature/ovpn-config-import

This commit is contained in:
pokamest 2022-12-04 22:04:51 +01:00
commit 19fce4975d
6 changed files with 260 additions and 348 deletions

View file

@ -157,8 +157,8 @@ TRANSLATIONS = \
win32 {
DEFINES += MVPN_WINDOWS
OTHER_FILES += platform_win/vpnclient.rc
RC_FILE = platform_win/vpnclient.rc
OTHER_FILES += platforms/windows/amneziavpn.rc
RC_FILE = platforms/windows/amneziavpn.rc
HEADERS += \
protocols/ikev2_vpn_protocol_windows.h \