diff options
| author | John Högberg <[email protected]> | 2019-07-11 11:24:20 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-07-11 11:24:20 +0200 |
| commit | 434883dac1173297a9fd82166068d52f843b3339 (patch) | |
| tree | a7359fc9cdd2cf63ecaa40745215bb8f25bb7506 /lib/erl_interface/src/prog/erl_start.h | |
| parent | bb3ab56962bae22e40b51dfce18ef37b465087a7 (diff) | |
| parent | 220eeb3670e536b55c8e6812de86481cedd83bfe (diff) | |
| download | otp-434883dac1173297a9fd82166068d52f843b3339.tar.gz otp-434883dac1173297a9fd82166068d52f843b3339.tar.bz2 otp-434883dac1173297a9fd82166068d52f843b3339.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'lib/erl_interface/src/prog/erl_start.h')
0 files changed, 0 insertions, 0 deletions