diff options
| author | Bryant Mairs <bryant@mai.rs> | 2017-07-31 08:31:12 -0700 |
|---|---|---|
| committer | Bryant Mairs <bryant@mai.rs> | 2017-08-01 14:26:55 -0700 |
| commit | f808cd28c71315738cf0ab631e01399e4fac04c5 (patch) | |
| tree | efafcc1c1bd0b123579ab5632ffd238e0694dd14 | |
| parent | b39d909c87fce201df0ad796d8a92df8d63b6291 (diff) | |
| download | nix-f808cd28c71315738cf0ab631e01399e4fac04c5.zip | |
Fix changelog from bad merge
| -rw-r--r-- | CHANGELOG.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d631d462..f1d278d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) @@ -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 |