diff options
author | John Högberg <[email protected]> | 2018-06-05 14:06:19 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-06-05 14:06:19 +0200 |
commit | 3836f8a1e757e6dff8316ab9938095b9611c75e6 (patch) | |
tree | 5f677921cffccfd0d5509e4c50baa50f530b5c62 /erts/Makefile | |
parent | 1002dd0444bd43353f33b03ab8fb0f19e57465dd (diff) | |
parent | 5cb944bf32b7b3f4ec5500710fe10c28a643e1fd (diff) | |
download | otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.tar.gz otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.tar.bz2 otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
inets: Gracefully handle bad headers
Diffstat (limited to 'erts/Makefile')
0 files changed, 0 insertions, 0 deletions