diff options
author | Ingela Anderton Andin <[email protected]> | 2011-01-24 14:49:16 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-01-24 14:49:16 +0100 |
commit | 2a49028427217bb7574274280524edee1e7f5d4d (patch) | |
tree | eafc223301521b8d69249188e05cd35099906286 /erts/emulator | |
parent | c9aae9e6874950c671c08940d4e72abc616c550e (diff) | |
parent | ac303885b1301762f772fcb7337fdfdc97c111d6 (diff) | |
download | otp-2a49028427217bb7574274280524edee1e7f5d4d.tar.gz otp-2a49028427217bb7574274280524edee1e7f5d4d.tar.bz2 otp-2a49028427217bb7574274280524edee1e7f5d4d.zip |
Merge branch 'ia/ssl-and-public_key/skip-tests-when-no-crypto-fix' into dev
* ia/ssl-and-public_key/skip-tests-when-no-crypto-fix:
Changed crypto start test so that it works as intended
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions