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

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

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

Visibility: public

Requested revision: c19dcafa17117475f8334d5186bd87fb56c9d315

Requested commit: c19dcafa17117475f8334d5186bd87fb56c9d315

Commit: c19dcafa17117475f8334d5186bd87fb56c9d315

Tree: f7af587f9a1355c5229699d78876f7d1a84942a4

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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