Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
vdagonneau committed Feb 20, 2019
2 parents abbd9b0 + a2fa282 commit be29e83
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Added

- Added `inotify_init1`, `inotify_add_watch` and `inotify_rm_watch` wrappers for
Android and Linux. ([#1016](https://github.com/nix-rust/nix/pull/1016))

- Add IP_RECVIF & IP_RECVDSTADDR. Enable IP_PKTINFO and IP6_PKTINFO on netbsd/openbsd.
([#1002](https://github.com/nix-rust/nix/pull/1002))
### Changed
Expand Down

0 comments on commit be29e83

Please sign in to comment.