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

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

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

Visibility: public

Requested revision: 338f155a02b72117ff710f72c8578e7d2f8eb296

Requested commit: 338f155a02b72117ff710f72c8578e7d2f8eb296

Commit: 338f155a02b72117ff710f72c8578e7d2f8eb296

Tree: a902526d5dc901de7458ef318f52f5ac0dad77e7

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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