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

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

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

Visibility: public

Requested revision: 2060c7c39b5c33fd6379a785b9beb921a22d1a6a

Requested commit: 2060c7c39b5c33fd6379a785b9beb921a22d1a6a

Commit: 2060c7c39b5c33fd6379a785b9beb921a22d1a6a

Tree: 706903c47f96ea2b3b2e66b2ae62d05acf078f72

Author: hryx

Committer: hryx

## Message

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

```

## Parents

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

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

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