aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/win32/nsis/Makefile
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-09-14 17:17:11 +0200
committerBjörn Gustavsson <[email protected]>2011-09-14 17:17:11 +0200
commit68c96ca855821adb42a25ced5b69446ae7ccc635 (patch)
tree8c4d9cbbb8d349aaf54ceb3344367ae078adf83f /erts/etc/win32/nsis/Makefile
parentb4a8af7158107ded0a3c5f7a51883c77a16b5c26 (diff)
parent4792b253584ca8d4429e1a353178db8cd0c470f4 (diff)
downloadotp-68c96ca855821adb42a25ced5b69446ae7ccc635.tar.gz
otp-68c96ca855821adb42a25ced5b69446ae7ccc635.tar.bz2
otp-68c96ca855821adb42a25ced5b69446ae7ccc635.zip
Merge branch 'bjorn/compiler-options/OTP-9534' into dev
* bjorn/compiler-options/OTP-9534: sys_pre_expand: Don't duplicate options given in the source code
Diffstat (limited to 'erts/etc/win32/nsis/Makefile')
0 files changed, 0 insertions, 0 deletions