aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-07-25 10:15:04 +0200
committerHenrik Nord <[email protected]>2014-07-25 10:15:04 +0200
commit1614c556d4b36d46f3791804b8a40cc0ddd16337 (patch)
treeab3d0c853d4bf9d4819897e2d119f67adb1c1fcb /erts
parentac3754a5ec2708f4499a00f7bfa5946af648bc28 (diff)
parent62081266545df8f5eda8e2043f33055cfe575126 (diff)
downloadotp-1614c556d4b36d46f3791804b8a40cc0ddd16337.tar.gz
otp-1614c556d4b36d46f3791804b8a40cc0ddd16337.tar.bz2
otp-1614c556d4b36d46f3791804b8a40cc0ddd16337.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 50de3c5d4d..5c4bb3ed25 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -940,6 +940,12 @@
Thanks to Matwey V. Kornilov</p>
<p>
Own Id: OTP-11829</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 5.10.4.1</title>
<section><title>Known Bugs and Problems</title>