aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-03-22 10:06:17 +0100
committerRaimo Niskanen <[email protected]>2018-03-22 10:06:17 +0100
commit0c151c6939a83f9a26a45d24fd504fc4fb2f3f01 (patch)
tree0d3c171138d07cbd0eaccbd895dd8a37efb5002d /erts/emulator
parenta59429dcf6f69054e5e82783f7adf8a03c11fcc7 (diff)
parentc5ee502e6031986983d3596745cad7fd547fd9c2 (diff)
downloadotp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.gz
otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.bz2
otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Update version numbers ssh: Fix bad spec for double_algs() in ssh.hrl Test event insert from init Fix init to allow all actions Conflicts: OTP_VERSION
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions