diff options
| author | Micael Karlberg <[email protected]> | 2018-09-21 13:59:04 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2018-09-21 13:59:04 +0200 |
| commit | 2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1 (patch) | |
| tree | e4783436ad8f87ba6f420c90a6e987df192010b2 /.gitignore | |
| parent | ceb5ac40d519cc475c6c3252a2e4f87cdcd5b6f0 (diff) | |
| parent | 0474c879d44f3fe5696f8c867ffb283ccab43949 (diff) | |
| download | otp-2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1.tar.gz otp-2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1.tar.bz2 otp-2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1.zip | |
Merge branch 'bmk/20180918/nififying_inet_freebsd/OTP-14831' into bmk/20180918/nififying_inet/OTP-14831
Also needed to "revert" two of the chnages, related to assoc id.
This is in FreeBSD defined as an uint32 but on linux as a int32.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index fee8cba0c7..4bd743f83a 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ x86_64-apple-darwin[0-9]*.[0-9]*.[0-9]* sparc-sun-solaris[0-9]*.[0-9]* i386-pc-solaris[0-9]*.[0-9]* i386-unknown-freebsd[0-9]*.[0-9]* +x86_64-unknown-freebsd[0-9]*.[0-9]* tile-tilera-linux-gnu powerpc-unknown-linux-gnu aarch64-unknown-linux-gnu |