diff options
| author | Jarred Allen <jarred@moveparallel.com> | 2023-05-22 14:36:59 -0700 |
|---|---|---|
| committer | Jarred Allen <jarred@moveparallel.com> | 2023-05-22 14:36:59 -0700 |
| commit | 3174d85d085a3d5dc64908ea12366698233645d5 (patch) | |
| tree | 87f77bc23fc3de4b3f8fb901eaaa95657f5765e2 /CHANGELOG.md | |
| parent | ff0fb3d18776151d0c8694f564ffb21164d1e17f (diff) | |
| parent | c6f9e2332efcf62c751d7a0174bb791e732b90a8 (diff) | |
| download | nix-3174d85d085a3d5dc64908ea12366698233645d5.zip | |
Merge branch 'master' into set-sockaddr-length-linux
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index daa8b6d9..c87abc4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Added `mq_timedreceive` to `::nix::mqueue`. ([#1966])(https://github.com/nix-rust/nix/pull/1966) - Added `LocalPeerPid` to `nix::sys::socket::sockopt` for macOS. ([#1967](https://github.com/nix-rust/nix/pull/1967)) +- Added `TFD_TIMER_CANCEL_ON_SET` to `::nix::sys::time::TimerSetTimeFlags` on Linux and Android. + ([#2040](https://github.com/nix-rust/nix/pull/2040)) ### Changed |