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

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

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

Visibility: public

Requested revision: d1cb16aace5f5996cf2556d07fd3418a951b31df

Requested commit: d1cb16aace5f5996cf2556d07fd3418a951b31df

Commit: d1cb16aace5f5996cf2556d07fd3418a951b31df

Tree: e154f475be8de6f0b0c486cf1baa1557c3f12b65

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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