Skip to content

Commit

Permalink
Fix changelog from bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Susurrus committed Jul 31, 2017
1 parent f8768e9 commit 857dccb
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 857dccb

Please sign in to comment.