aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-11-10 11:32:36 +0100
committerIngela Anderton Andin <[email protected]>2016-11-10 11:32:36 +0100
commit2f58832190637cfbaf830ef23f8fe0692235bf2d (patch)
tree735a80115d2234ab8b5e641171000a0052c1a93d /erts/emulator
parentb41e8edf3b7076470c45233d30686dd8b0abc871 (diff)
parent3bdf75715ef1b2c3afdaadcfb79ab6a0ddacb974 (diff)
downloadotp-2f58832190637cfbaf830ef23f8fe0692235bf2d.tar.gz
otp-2f58832190637cfbaf830ef23f8fe0692235bf2d.tar.bz2
otp-2f58832190637cfbaf830ef23f8fe0692235bf2d.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions