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

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

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

Visibility: public

Requested revision: 7998e2b0f41bff86d8fbbb8112dd6c629d47e849

Requested commit: 7998e2b0f41bff86d8fbbb8112dd6c629d47e849

Commit: 7998e2b0f41bff86d8fbbb8112dd6c629d47e849

Tree: 9f7bca5991f9fcdb291da10e2c830a749769dfad

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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