Skip to content

Commit f808cd2

Browse files
committed
Fix changelog from bad merge
1 parent b39d909 commit f808cd2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
66
## [Unreleased]
77

88
### Added
9+
- Added `nix::poll` module for all platforms
10+
([#672](https://github.com/nix-rust/nix/pull/672))
11+
- Added `nix::ppoll` function for FreeBSD and DragonFly
12+
([#672](https://github.com/nix-rust/nix/pull/672))
913
- Added protocol families in `AddressFamily` enum.
1014
([#647](https://github.com/nix-rust/nix/pull/647))
1115

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

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

0 commit comments

Comments
 (0)