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

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

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

Visibility: public

Requested revision: 3178807657f0d75646c9de11ba4b23ee556e70da

Requested commit: 3178807657f0d75646c9de11ba4b23ee556e70da

Commit: 3178807657f0d75646c9de11ba4b23ee556e70da

Tree: 0e8f668368e68a3fe7b510ae00aaa5d48dc379b2

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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