aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-11-09 15:19:21 +0100
committerLukas Larsson <[email protected]>2018-11-09 15:19:21 +0100
commit85591a55983966ff2f25805abc8d61c8b4c05944 (patch)
treef6b16f19089ae58fa1031550d604238470080e6c /scripts
parent08287750efc23e376b2843af126d26c229a31a96 (diff)
parentcb86d6daabc6dc2af7d05fd1c5b44b1697bad926 (diff)
downloadotp-85591a55983966ff2f25805abc8d61c8b4c05944.tar.gz
otp-85591a55983966ff2f25805abc8d61c8b4c05944.tar.bz2
otp-85591a55983966ff2f25805abc8d61c8b4c05944.zip
Merge branch 'maint-20' into maint
* maint-20: 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/ssl/doc/src/notes.xml lib/ssl/vsn.mk lib/stdlib/doc/src/notes.xml lib/stdlib/vsn.mk make/otp_version_tickets otp_versions.table
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions