aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/unix/sys.c
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-08-31 10:28:02 +0200
committerRaimo Niskanen <[email protected]>2016-08-31 10:28:02 +0200
commitbba0f5924fa9478d41903331a3285f117c112731 (patch)
tree9e7c0d70d7c9ddf36d4e72a92439dc0ecb852cb2 /erts/emulator/sys/unix/sys.c
parent794c7616a5627fde16b954ffc609149e41429a9f (diff)
parent96da2a50c90fcad84a8776f8c1dac008a6b24b39 (diff)
downloadotp-bba0f5924fa9478d41903331a3285f117c112731.tar.gz
otp-bba0f5924fa9478d41903331a3285f117c112731.tar.bz2
otp-bba0f5924fa9478d41903331a3285f117c112731.zip
Merge branch 'raimo/gen_statem-callback_mode/OTP-13752' into maint
* raimo/gen_statem-callback_mode/OTP-13752: ssl: Upgrade suite testing skipped if stdlib upgrade is required Fix version numbers and dependencies Conflicts: lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk
Diffstat (limited to 'erts/emulator/sys/unix/sys.c')
0 files changed, 0 insertions, 0 deletions