aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-11-02 10:24:30 +0100
committerHenrik Nord <[email protected]>2015-11-02 10:24:30 +0100
commit0a16594912e2d77e70eccf89232df8287f0336c5 (patch)
tree275dcabb2312d0beee5ba38a456c55a242fa1d0f /erts
parentb1ad99703569e054036d42b62f5c0d22855b9935 (diff)
parent33b1771503cd399c8d0ce512ed98e2701a0c4ac8 (diff)
downloadotp-0a16594912e2d77e70eccf89232df8287f0336c5.tar.gz
otp-0a16594912e2d77e70eccf89232df8287f0336c5.tar.bz2
otp-0a16594912e2d77e70eccf89232df8287f0336c5.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rwxr-xr-xerts/etc/win32/nsis/find_redist.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh
index c0895c9dd5..03e92b21c7 100755
--- a/erts/etc/win32/nsis/find_redist.sh
+++ b/erts/etc/win32/nsis/find_redist.sh
@@ -164,7 +164,7 @@ fi
#echo $BPATH_LIST
for BP in $BPATH_LIST; do
- for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0" "v7.0A" "v7.1"; do
+ for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0" "v7.0A" "v7.1" "VC redist 1033"; do
BPATH=$BP
fail=false
allow_fail=false