# Merge branch 'master' into c-to-zig · gitcafe/zig

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

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

Visibility: public

Requested revision: 3c41c2d84b8de5a95a322a3f0d8424adf6df8667

Requested commit: 3c41c2d84b8de5a95a322a3f0d8424adf6df8667

Commit: 3c41c2d84b8de5a95a322a3f0d8424adf6df8667

Tree: 0a0722e68311711a6b9dafafa3c713184cd13306

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into c-to-zig

```

## Parents

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

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

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