Merge branch 'dev' into feature/ovpn-config-import
This commit is contained in:
commit
19fce4975d
6 changed files with 260 additions and 348 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include <windows.h>
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
|
||||
IDI_ICON1 ICON "../images/app.ico"
|
||||
IDI_ICON1 ICON "../../images/app.ico"
|
||||
|
||||
#define VER_FILEVERSION 2,0,0,0
|
||||
#define VER_FILEVERSION_STR "2.0.0.0\0"
|
||||
Loading…
Add table
Add a link
Reference in a new issue