diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-05-11 10:35:05 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-05-11 10:35:05 +0200 |
| commit | 5e27065ab2d3f12f84b07fd547d4cc44de410954 (patch) | |
| tree | a6a77b5061f589e7f770dbb527f9bfcbc4c7bbb4 /lib/ssl/src/ssl_cipher.hrl | |
| parent | 56e271a7d63dbc76962c875e34fe3584e9110675 (diff) | |
| parent | 428492feee831f610a7651fd98c9f4d75e34e726 (diff) | |
| download | otp-5e27065ab2d3f12f84b07fd547d4cc44de410954.tar.gz otp-5e27065ab2d3f12f84b07fd547d4cc44de410954.tar.bz2 otp-5e27065ab2d3f12f84b07fd547d4cc44de410954.zip | |
Merge branch 'aw/native-cpu_sup/OTP-12730'
* aw/native-cpu_sup/OTP-12730:
erts: Fix configure.in
os_mon: rename send() to sendi() in cpu_sup.c
os_mon: cpu_sup should use native sysctl/libkvm calls on BSD
Diffstat (limited to 'lib/ssl/src/ssl_cipher.hrl')
0 files changed, 0 insertions, 0 deletions