diff options
| author | Hans Nilsson <[email protected]> | 2019-04-12 14:48:21 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-04-12 14:48:21 +0200 |
| commit | be1c449af5afb7b6494b7e2629977fbc024de087 (patch) | |
| tree | 42e6dee96da46b551ea67494905ed836f67316e0 /lib/erl_interface | |
| parent | c24ea58313c7a2b837831c9c8f9439d0ababe5df (diff) | |
| parent | 7ad05d6dd4230061e8120ae8c0dec2535f47e294 (diff) | |
| download | otp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.gz otp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.bz2 otp-be1c449af5afb7b6494b7e2629977fbc024de087.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
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) |