# Merge branch 'freebsd-up' of https://github.com/myfreeweb/zig into freebsd2 · gitcafe/zig

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

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

Visibility: public

Requested revision: 9493738e5448ca166344a2d57abc44b29bb00081

Requested commit: 9493738e5448ca166344a2d57abc44b29bb00081

Commit: 9493738e5448ca166344a2d57abc44b29bb00081

Tree: 9721b3e694e45f17ba21c0884759fba31fe0e1de

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'freebsd-up' of https://github.com/myfreeweb/zig into freebsd2

```

## Parents

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

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

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