diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-12-03 10:55:20 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-12-03 10:55:20 +0100 |
| commit | 588e344102ac9d9a6954336a650087a54c84fa53 (patch) | |
| tree | 99a81b33e8c77c71157e71e9f4a5ff0bcd7acdaa /lib/kernel/src/inet_res.hrl | |
| parent | d3b33e7c9c2885ac864ef67b7ff741ce433cbf22 (diff) | |
| parent | 447aa749a1999edd3bbbc0ee4905b92a0cdb41eb (diff) | |
| download | otp-588e344102ac9d9a6954336a650087a54c84fa53.tar.gz otp-588e344102ac9d9a6954336a650087a54c84fa53.tar.bz2 otp-588e344102ac9d9a6954336a650087a54c84fa53.zip | |
Merge branch 'ia/ssl/appup-fix' into maint
* ia/ssl/appup-fix:
ssl: Correct appup
Diffstat (limited to 'lib/kernel/src/inet_res.hrl')
0 files changed, 0 insertions, 0 deletions