aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2017-02-08 11:36:41 +0100
committerRaimo Niskanen <[email protected]>2017-02-08 11:36:41 +0100
commit835f29dd5bf75a25138ac723ea8644c0b4fce80c (patch)
treea9c3c953b50b2cddd8acf2049f997d5784b1a09a /lib/inets/doc/src
parenta7582454a5414232823587ee1ba58da55a87953d (diff)
parentc41a6e8a377534158b4fcaf07c5b260d80221dbd (diff)
downloadotp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.tar.gz
otp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.tar.bz2
otp-835f29dd5bf75a25138ac723ea8644c0b4fce80c.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/notes.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 398fc7e5b6..5c3b5a2d3c 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,22 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 6.3.4</title>
+ <section><title>Inets 6.3.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Correct misstakes in ftp client introduced in inets-6.3.4</p>
+ <p>
+ Own Id: OTP-14203 Aux Id: OTP-13982 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 6.3.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>