aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-12-18 12:25:03 +0100
committerHenrik Nord <[email protected]>2015-12-18 12:25:03 +0100
commitfc3ec3e298b8908a7065297c7a824de5eec13a51 (patch)
tree6a356bb53a8400cd8e561740b43e8a0b27a57aff /erts/doc
parente6a733c5a903fafb52b73f7813fed72e4e29be6c (diff)
parent21d6192389a04024f7a41ced9d0911a9cce6f4e8 (diff)
downloadotp-fc3ec3e298b8908a7065297c7a824de5eec13a51.tar.gz
otp-fc3ec3e298b8908a7065297c7a824de5eec13a51.tar.bz2
otp-fc3ec3e298b8908a7065297c7a824de5eec13a51.zip
Merge branch 'maint'
Conflicts: OTP_VERSION erts/vsn.mk
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/notes.xml21
1 files changed, 21 insertions, 0 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 5cb9bdb690..a726cc7b97 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,27 @@
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 7.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Revert "Fix erroneous splitting of emulator path"</p>
+ <p>
+ Own Id: OTP-13202</p>
+ </item>
+ <item>
+ <p>
+ Fix HiPE enabled emulator for FreeBSD.</p>
+ <p>
+ Own Id: OTP-13204 Aux Id: pr926 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 7.2</title>
<section><title>Fixed Bugs and Malfunctions</title>