# Merge branch 'master' into math · gitcafe/zig

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

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

Visibility: public

Requested revision: 799c69910172a7248ab9db366e6e3a6556e7d626

Requested commit: 799c69910172a7248ab9db366e6e3a6556e7d626

Commit: 799c69910172a7248ab9db366e6e3a6556e7d626

Tree: 000c3e87de36873028b0fed44c4864c0baaa55eb

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into math

```

## Parents

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

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

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