From 857dccb46c50066157f519e4495dffb870520ca6 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Mon, 31 Jul 2017 08:31:12 -0700 Subject: [PATCH] Fix changelog from bad merge --- CHANGELOG.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 688b0dcca5..c4d553d2d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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)) + ### Changed - Renamed existing `ptrace` wrappers to encourage namespacing ([#692](https://github.com/nix-rust/nix/pull/692)) @@ -34,10 +40,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