aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorZandra <[email protected]>2016-02-02 10:41:30 +0100
committerZandra <[email protected]>2016-02-02 10:41:30 +0100
commit1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0 (patch)
tree01d361559f79f86fb4a21688f1a3fca0d0051b20 /erts/emulator
parent1e0d9d21e20d840ae9f7822bc956eca6c779412c (diff)
parent0f15f90ef5f482b0e860e41438151a5d9c4859e7 (diff)
downloadotp-1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0.tar.gz
otp-1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0.tar.bz2
otp-1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions