From b54bed4a0ad0d77a89fd335ef5f3990ae78d618d Mon Sep 17 00:00:00 2001
From: PKEuS <philipp@pkeus.de>
Date: Sat, 29 Jul 2017 12:11:58 +0200
Subject: [PATCH] Windows Installer: Update merge module file name (path
 incorrect, files need to be copied from its new, strange location to
 "C:/Program Files (x86)/Common Files/Merge Modules")

---
 win_installer/config.wxi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index 73fb7c0f9..cac17cc40 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -9,10 +9,10 @@
   <?define QtDllDir = "..\bin" ?>
 
   <?if $(var.Platform) = x64 ?>
-    <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_x64.msm" ?>
+    <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC150_CRT_x64.msm" ?>
     <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
   <?else?>
-    <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_x86.msm" ?>
+    <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC150_CRT_x86.msm" ?>
     <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
   <?endif?>
 </Include>