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

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

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

Visibility: public

Requested revision: c423697c78462f4e817869a3b25e72af33ce09ed

Requested commit: c423697c78462f4e817869a3b25e72af33ce09ed

Commit: c423697c78462f4e817869a3b25e72af33ce09ed

Tree: 9fa567896dbf4c4b34ac5afc3fa2c899e8275b66

Author: hryx

Committer: hryx

## Message

```
Merge branch 'master' into translate-c-userland

```

## Parents

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

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

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