diff options
| author | Henrik Nord <[email protected]> | 2011-09-08 16:32:59 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-08 16:33:03 +0200 |
| commit | 2ee4aed839aa63243e2c12694822cfdef7c4ea60 (patch) | |
| tree | 4626128716280463434c9ee424a7a98be9e44b7a /erts/emulator | |
| parent | d3d5a066f06509fa7546443bf841d07167c5fb60 (diff) | |
| parent | 52230a417ad005711876132d144b3fe8a72d7e8e (diff) | |
| download | otp-2ee4aed839aa63243e2c12694822cfdef7c4ea60.tar.gz otp-2ee4aed839aa63243e2c12694822cfdef7c4ea60.tar.bz2 otp-2ee4aed839aa63243e2c12694822cfdef7c4ea60.zip | |
Merge branch 'dc/fix_win32_static_crypto' into dev
* dc/fix_win32_static_crypto:
Fix win32 OpenSSL static linking broken in 20c9d6e
OTP-9532
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions