diff options
| author | Hans Nilsson <[email protected]> | 2019-02-28 12:31:09 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-02-28 12:31:09 +0100 |
| commit | 5645812561e52c8f21821077bd58c22c1dd609f1 (patch) | |
| tree | dac6a8b3a4c4e8b912eaaed7235fe0546074f5d8 /erts/Makefile | |
| parent | cee872cda90b837e64e531b499d8441fb8e6cbea (diff) | |
| parent | cae1ccbbde020d71e296ad75b0505e0600c03339 (diff) | |
| download | otp-5645812561e52c8f21821077bd58c22c1dd609f1.tar.gz otp-5645812561e52c8f21821077bd58c22c1dd609f1.tar.bz2 otp-5645812561e52c8f21821077bd58c22c1dd609f1.zip | |
Merge branch 'hans/crypto/bad_ret_fips/master/OTP-15634'
* hans/crypto/bad_ret_fips/master/OTP-15634:
crypto: Fix FIPS mode
Diffstat (limited to 'erts/Makefile')
0 files changed, 0 insertions, 0 deletions