diff options
author | Ingela Anderton Andin <[email protected]> | 2011-01-21 09:57:22 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-01-21 09:57:22 +0100 |
commit | c9aae9e6874950c671c08940d4e72abc616c550e (patch) | |
tree | 01e0db63432942a98355b4f34a9e034cc747df75 /erts/emulator/beam/erl_time.h | |
parent | 4c70b07402581cbcdc1204961344cb28bf383d20 (diff) | |
parent | c6238ffaa4ef8bbe0aff8fde402a3254e746d3cc (diff) | |
download | otp-c9aae9e6874950c671c08940d4e72abc616c550e.tar.gz otp-c9aae9e6874950c671c08940d4e72abc616c550e.tar.bz2 otp-c9aae9e6874950c671c08940d4e72abc616c550e.zip |
Merge branch 'ia/ssl-and-public_key/skip-test-if-no-crypto' into dev
* ia/ssl-and-public_key/skip-test-if-no-crypto:
Skip ssl and public key tests if crypto fails to start
Diffstat (limited to 'erts/emulator/beam/erl_time.h')
0 files changed, 0 insertions, 0 deletions