diff options
| author | Hans Nilsson <hans@erlang.org> | 2019-04-12 14:48:23 +0200 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2019-04-12 14:48:23 +0200 |
| commit | efcf68b66bf44f038bca06ade787223e4ba896ca (patch) | |
| tree | 25c1a9c75ec521fea21b1dc1a91e5b888e611fd3 /lib/erl_interface | |
| parent | 5db9ad449acfb72557409df0dee2a1b96031a584 (diff) | |
| parent | be1c449af5afb7b6494b7e2629977fbc024de087 (diff) | |
| download | erlang-efcf68b66bf44f038bca06ade787223e4ba896ca.tar.gz | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'lib/erl_interface')
| -rw-r--r-- | lib/erl_interface/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | lib/erl_interface/vsn.mk | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml index 32d28b853b..5ad0e2499b 100644 --- a/lib/erl_interface/doc/src/notes.xml +++ b/lib/erl_interface/doc/src/notes.xml @@ -31,6 +31,22 @@ </header> <p>This document describes the changes made to the Erl_interface application.</p> +<section><title>Erl_Interface 3.11.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix handling of Makefile dependencies so that parallel + make works properly.</p> + <p> + Own Id: OTP-15757</p> + </item> + </list> + </section> + +</section> + <section><title>Erl_Interface 3.11.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk index dae6052d55..5e63f75ab5 100644 --- a/lib/erl_interface/vsn.mk +++ b/lib/erl_interface/vsn.mk @@ -1,2 +1,2 @@ -EI_VSN = 3.11.1 +EI_VSN = 3.11.2 ERL_INTERFACE_VSN = $(EI_VSN) |