Skip to content

Commit

Permalink
Merge #716
Browse files Browse the repository at this point in the history
716: Fix changelog from bad merge r=Susurrus

Missed this when merging #672.
  • Loading branch information
bors[bot] committed Aug 1, 2017
2 parents b39d909 + f808cd2 commit 607ab97
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]

### Added
- Added `nix::poll` module for all platforms
([#672](https://github.com/nix-rust/nix/pull/672))
- Added `nix::ppoll` function for FreeBSD and DragonFly
([#672](https://github.com/nix-rust/nix/pull/672))
- Added protocol families in `AddressFamily` enum.
([#647](https://github.com/nix-rust/nix/pull/647))

Expand Down Expand Up @@ -42,10 +46,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- On Linux and Android, added support for receiving `PTRACE_O_TRACESYSGOOD`
events from `wait` and `waitpid` using `WaitStatus::PtraceSyscall`
([#566](https://github.com/nix-rust/nix/pull/566)).
- Added `nix::poll` module for all platforms
([#672](https://github.com/nix-rust/nix/pull/672))
- Added `nix::ppoll` function for FreeBSD and DragonFly
([#672](https://github.com/nix-rust/nix/pull/672))

### Changed
- The `ioctl!` macro and its variants now allow the generated functions to have
Expand Down

0 comments on commit 607ab97

Please sign in to comment.