diff options
| author | Odd Stranne <odd@mullvad.net> | 2018-07-13 12:55:57 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2018-07-13 12:55:57 +0200 |
| commit | d7772ffefb4552609f6ad9a4adededd8eeda9d08 (patch) | |
| tree | ea2a8d797669565831cef4b722c5023cc6b9a726 | |
| parent | a6ef193215e73636268a9b6bb0a7477765b5f687 (diff) | |
| parent | f58c170901427002616d1a1e74d1ed574dacfd5e (diff) | |
| download | mullvadvpn-d7772ffefb4552609f6ad9a4adededd8eeda9d08.tar.xz mullvadvpn-d7772ffefb4552609f6ad9a4adededd8eeda9d08.zip | |
Merge branch 'add-installer-banner'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | dist-assets/windows/installersidebar.bmp | bin | 0 -> 154542 bytes | |||
| -rw-r--r-- | electron-builder.yml | 1 |
3 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 17f9f2a9ce..4255080524 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ Line wrap the file at 100 chars. Th #### Windows - Include version information (meta data) in executables and DLLs. - Include manifest in daemon so it always runs with administrator privileges. +- Add sidebar graphic in installer/uninstaller. ### Changed - App now uses statically linked OpenSSL on all platforms. diff --git a/dist-assets/windows/installersidebar.bmp b/dist-assets/windows/installersidebar.bmp Binary files differnew file mode 100644 index 0000000000..407df044e9 --- /dev/null +++ b/dist-assets/windows/installersidebar.bmp diff --git a/electron-builder.yml b/electron-builder.yml index 4323fb3bc0..4070599971 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -58,6 +58,7 @@ nsis: allowElevation: true allowToChangeInstallationDirectory: true include: dist-assets/windows/installer.nsh + installerSidebar: dist-assets/windows/installersidebar.bmp win: target: |
