aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-11-30 10:34:24 +0100
committerRickard Green <[email protected]>2018-11-30 10:34:24 +0100
commit336b54dbc87a8a9bc661b667544144b8dcfd26ba (patch)
tree838b021277ecfe9ea89e83bbc44b8173b4b72aea /erts/emulator
parent113ca3ee350ff2c8b1a39cc337890fb1bd637853 (diff)
parent9ba90b46b2df0db9678be3479d101b05c8265856 (diff)
downloadotp-336b54dbc87a8a9bc661b667544144b8dcfd26ba.tar.gz
otp-336b54dbc87a8a9bc661b667544144b8dcfd26ba.tar.bz2
otp-336b54dbc87a8a9bc661b667544144b8dcfd26ba.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions