aboutsummaryrefslogtreecommitdiffstats
path: root/erts/obj
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-11-14 09:34:05 +0100
committerLukas Larsson <[email protected]>2018-11-14 09:34:05 +0100
commitb0c054fe7c8f6467f3309e47ec62cfc9300bcc14 (patch)
treea63bf718709752cbea4e0eb2a4ddaf1a08ea21d7 /erts/obj
parent56af71ad0a1127aad96b523f09618280f77cdf94 (diff)
parent1283ca3bc4bba3381f8fd1f59fb62780d3e17472 (diff)
downloadotp-b0c054fe7c8f6467f3309e47ec62cfc9300bcc14.tar.gz
otp-b0c054fe7c8f6467f3309e47ec62cfc9300bcc14.tar.bz2
otp-b0c054fe7c8f6467f3309e47ec62cfc9300bcc14.zip
Merge branch 'maint-18' into maint
* maint-18: Updated OTP version Prepare release Optimize operator '--' and yield on large inputs Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/emulator/beam/erl_alloc.types erts/emulator/beam/erl_bif_lists.c erts/vsn.mk lib/stdlib/doc/src/notes.xml lib/stdlib/vsn.mk make/otp_version_tickets otp_versions.table
Diffstat (limited to 'erts/obj')
0 files changed, 0 insertions, 0 deletions