# Merge remote-tracking branch 'origin/master' into llvm12 · gitcafe/zig

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

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

Visibility: public

Requested revision: 755c5580267b246983fc0b2b2fb8dccfc261b9a0

Requested commit: 755c5580267b246983fc0b2b2fb8dccfc261b9a0

Commit: 755c5580267b246983fc0b2b2fb8dccfc261b9a0

Tree: 4b30c2cbdfc00a59f461ec5992e02494e6ae10ba

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into llvm12

```

## Parents

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

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

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