aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/Makefile
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-07-01 15:54:12 +0200
committerErlang/OTP <[email protected]>2015-07-01 15:54:12 +0200
commitfb794658ae54b304219c907648f230decf10d622 (patch)
tree1c6a10b4f956b70a6d3db9540be0fe9f055d5e05 /lib/megaco/Makefile
parent0f3f8f5871a1ea503cc80ae17adc8dec96c79445 (diff)
parent77d6dfd57e87daf7d0f2a02f7c592574241ad2d2 (diff)
downloadotp-fb794658ae54b304219c907648f230decf10d622.tar.gz
otp-fb794658ae54b304219c907648f230decf10d622.tar.bz2
otp-fb794658ae54b304219c907648f230decf10d622.zip
Merge branch 'ia/inets/maint-15/fd/OTP-12874' into maint-r15
* ia/inets/maint-15/fd/OTP-12874: ssl: Fix appup inets: Prepare for release inets: Fix broken fd feature
Diffstat (limited to 'lib/megaco/Makefile')
0 files changed, 0 insertions, 0 deletions