aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-10-23 11:30:40 +0200
committerHenrik Nord <[email protected]>2014-10-23 11:30:40 +0200
commit9f0477e13bb8819ee252d2b8834c1411f02a9cb8 (patch)
tree6373cd013fc3ff1220b3845a8e50230d8105c04c /erts/emulator
parente97f9bc1672cb2d2c07d4133030528b43b26532c (diff)
parent461757503e8ecaaeb3ea9b84f5c0dfccd3408694 (diff)
downloadotp-9f0477e13bb8819ee252d2b8834c1411f02a9cb8.tar.gz
otp-9f0477e13bb8819ee252d2b8834c1411f02a9cb8.tar.bz2
otp-9f0477e13bb8819ee252d2b8834c1411f02a9cb8.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions