aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-01 14:57:57 +0200
committerHenrik Nord <[email protected]>2015-10-01 15:13:47 +0200
commitc1d11c28ca748075cae5330102bccd10a56b8686 (patch)
tree4855962ba19b6dcf16c7c2d43ab7d8b82d9ef682 /lib
parent46178552c4622b29d5a70ca23d945e9036caa437 (diff)
parentbd1251dfe4d60f09e569731d36a92e94acbe297a (diff)
downloadotp-c1d11c28ca748075cae5330102bccd10a56b8686.tar.gz
otp-c1d11c28ca748075cae5330102bccd10a56b8686.tar.bz2
otp-c1d11c28ca748075cae5330102bccd10a56b8686.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/debugger/doc/src/notes.xml lib/debugger/vsn.mk otp_versions.table
Diffstat (limited to 'lib')
-rw-r--r--lib/debugger/doc/src/notes.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 4a415a538f..3eaecf86b2 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -34,7 +34,6 @@
application.</p>
<section><title>Debugger 4.1.1</title>
-
<section><title>Fixed Bugs and Malfunctions</title>
<list>
<item>
@@ -49,6 +48,7 @@
</section>
+
<section><title>Debugger 4.1</title>
<section><title>Improvements and New Features</title>