diff options
author | Hans Bolinder <[email protected]> | 2018-01-23 11:37:34 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2018-01-23 11:37:34 +0100 |
commit | 716ef17d2a00c7f4a5a5cf92fffd18adb94c542d (patch) | |
tree | f517f0ae5ed2c1a6546d5d18df46dcfaf03935e1 /lib/kernel/src/inet_dns.hrl | |
parent | b7ff9c0d76372f16d14ecaac04c6fbbbadaf9435 (diff) | |
parent | dc6a03a8351819a91c1e9235dd84df0acd4ba6b8 (diff) | |
download | otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.tar.gz otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.tar.bz2 otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.zip |
Merge branch 'maint'
* maint:
kernel: Correct contracts and a bug in group_history
stdlib: Correct contracts
dialyzer: Optimize handling of a lot of warnings
Conflicts:
lib/kernel/src/erl_boot_server.erl
Diffstat (limited to 'lib/kernel/src/inet_dns.hrl')
0 files changed, 0 insertions, 0 deletions