# Merge remote-tracking branch 'origin/master' into FireFox317-windows-evented-io · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/beebcbb677350b86c9f36a850a8b8853b7a71769)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: beebcbb677350b86c9f36a850a8b8853b7a71769

Requested commit: beebcbb677350b86c9f36a850a8b8853b7a71769

Commit: beebcbb677350b86c9f36a850a8b8853b7a71769

Tree: cc9c09cecdc0c702d1f1f34ae87967dcc98c4089

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into FireFox317-windows-evented-io

```

## Parents

- [43f7856bac5fd1a93970d7cebd20289de2367691](https://git.cafe/gitcafe/zig/commit/43f7856bac5fd1a93970d7cebd20289de2367691?format=markdown)

- [3dbe02e2d8cda1fe0072e71ae7630170c270419e](https://git.cafe/gitcafe/zig/commit/3dbe02e2d8cda1fe0072e71ae7630170c270419e?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/beebcbb677350b86c9f36a850a8b8853b7a71769?format=markdown)