diff options
author | Henrik Nord <[email protected]> | 2016-02-15 15:04:10 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2016-02-15 15:04:10 +0100 |
commit | 8f178301f36ac2061688c3a9729109326ef84441 (patch) | |
tree | c2704e0c937f1701d79e0e3dd318decb7e094fd1 /.gitattributes | |
parent | 84818479ea74a7084169f415b9253aa2ff6af69d (diff) | |
parent | b801a5b7239876742eee47f1d39d95350fdd30d8 (diff) | |
download | otp-8f178301f36ac2061688c3a9729109326ef84441.tar.gz otp-8f178301f36ac2061688c3a9729109326ef84441.tar.bz2 otp-8f178301f36ac2061688c3a9729109326ef84441.zip |
Merge branch 'tuncer/ei-breakage' into maint
* tuncer/ei-breakage:
ei: fix breakage reported by Sergei Golovan
Revert "musl: fix gethostbyname_r/gethostbyaddr_ selection"
OTP-13328
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions