diff options
author | Ingela Anderton Andin <[email protected]> | 2015-09-10 09:13:50 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-09-10 09:13:50 +0200 |
commit | 45f29845fea2fa036e03f0faf451ca98813b3112 (patch) | |
tree | 4e3c55305a35454ad20e87783fe7838c5c184389 /lib/diameter/vsn.mk | |
parent | 79da6e851e98729d103979ba466d47f4fa4421b2 (diff) | |
parent | 628553c2946649ef1715feacc05e8f75d38ef2e3 (diff) | |
download | otp-45f29845fea2fa036e03f0faf451ca98813b3112.tar.gz otp-45f29845fea2fa036e03f0faf451ca98813b3112.tar.bz2 otp-45f29845fea2fa036e03f0faf451ca98813b3112.zip |
Merge branch 'ia/inets/httpd/tftpd/fd/OTP-12875/OTP-12898' into maint
* ia/inets/httpd/tftpd/fd/OTP-12875/OTP-12898:
inets: Add test suite for socket_wrap feature
inets: Ctify inets_SUITE
inets: tftpd - Mend broken fd option
inets: httpd - Mend broken fd option
Diffstat (limited to 'lib/diameter/vsn.mk')
0 files changed, 0 insertions, 0 deletions