aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-18 12:08:44 +0100
committerMicael Karlberg <[email protected]>2011-03-18 12:08:44 +0100
commite343c5b24ca4d642f327e6ec57d63094b28b2838 (patch)
tree2f86813124b3d6a3f1b44b732674cfd2dfa6509a /lib/inets/doc/src
parent588a0d9c86b1b85a2cd7635460564ddaac566882 (diff)
parent6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce (diff)
downloadotp-e343c5b24ca4d642f327e6ec57d63094b28b2838.tar.gz
otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.tar.bz2
otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.zip
Merge branch 'bmk/inets/ftp/missing_spec_causes_dialyxer_problems/OTP-9114' into bmk/inets/inet56_integration
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/notes.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 4c572e3a9c..e08d0180b6 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -48,6 +48,11 @@
<p>Filipe David Manana</p>
<p>Own Id: OTP-9094</p>
</item>
+
+ <item>
+ <p>[ftp] Added (type) spec for all exported functions.</p>
+ <p>Own Id: OTP-9114 Aux Id: seq11799</p>
+ </item>
</list>
</section>