aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src/gen_sctp.xml
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-10-28 14:31:01 +0200
committerNiclas Eklund <[email protected]>2010-10-28 14:31:01 +0200
commitde0ce3407717573e9591b086a1829f16ed88d289 (patch)
treef30862fefada34f103c1d5bf3944e701f0448c0c /lib/kernel/doc/src/gen_sctp.xml
parent0de086094e295119dafa14eb3b02884a538fedcc (diff)
parent489be05ffa13d66726b3c5d61227294aa1dad992 (diff)
downloadotp-de0ce3407717573e9591b086a1829f16ed88d289.tar.gz
otp-de0ce3407717573e9591b086a1829f16ed88d289.tar.bz2
otp-de0ce3407717573e9591b086a1829f16ed88d289.zip
Merge branch 'maint-r13' into maint-r14
Conflicts: lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.appup.src lib/ssh/src/ssh_system_sup.erl lib/ssh/vsn.mk
Diffstat (limited to 'lib/kernel/doc/src/gen_sctp.xml')
0 files changed, 0 insertions, 0 deletions