diff options
| author | Lukas Larsson <[email protected]> | 2016-03-18 15:22:24 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-03-18 15:22:24 +0100 |
| commit | 06c0c79a1159345d7a3232d3cbb9cfc8975ef73f (patch) | |
| tree | 91bf967c65e0216e38e62f6c3e9787b6924b9b3f /erts/emulator/beam/atom.names | |
| parent | b00fe8c7d5740f53bef4f7884d408052631c0cb5 (diff) | |
| parent | 74932408e62100dec7ece2365ee221e68a809de7 (diff) | |
| download | otp-06c0c79a1159345d7a3232d3cbb9cfc8975ef73f.tar.gz otp-06c0c79a1159345d7a3232d3cbb9cfc8975ef73f.tar.bz2 otp-06c0c79a1159345d7a3232d3cbb9cfc8975ef73f.zip | |
Merge branch 'lukas/erts/fix-vsyslog-freebsd/OTP-13427'
* lukas/erts/fix-vsyslog-freebsd/OTP-13427:
erts: Fix run_erl syslog prototypes for freebsd
Conflicts:
erts/etc/unix/run_erl.c
Diffstat (limited to 'erts/emulator/beam/atom.names')
0 files changed, 0 insertions, 0 deletions