summaryrefslogtreecommitdiff
path: root/lib/erl_interface
diff options
context:
space:
mode:
authorMicael Karlberg <bmk@erlang.org>2019-04-17 11:59:06 +0200
committerMicael Karlberg <bmk@erlang.org>2019-04-17 11:59:06 +0200
commit143682bb10ff77971ea93fb9c3d502d0451276d6 (patch)
tree225f22ad2c64d53a845c838c79f4fc1855cea27b /lib/erl_interface
parentc24da18e02cf20f1a08d7a25f94ca9c841d73d85 (diff)
parent22a55c40254cfee683e070167794fab632bef865 (diff)
downloaderlang-143682bb10ff77971ea93fb9c3d502d0451276d6.tar.gz
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/erl_interface/doc/src/notes.xml # lib/erl_interface/vsn.mk # lib/snmp/doc/src/notes.xml # lib/snmp/vsn.mk # lib/ssh/doc/src/notes.xml # lib/ssh/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
Diffstat (limited to 'lib/erl_interface')
-rw-r--r--lib/erl_interface/doc/src/notes.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 5ad0e2499b..fc6a1bb548 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -169,6 +169,22 @@
</section>
+<section><title>Erl_Interface 3.10.2.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.10.2.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
@@ -1619,4 +1635,3 @@
</section>
</section>
</chapter>
-