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

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

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

Visibility: public

Requested revision: bccef441963434b452a623abbb9315fd92c1e255

Requested commit: bccef441963434b452a623abbb9315fd92c1e255

Commit: bccef441963434b452a623abbb9315fd92c1e255

Tree: 4c0ea89b8fa895b3d34749ec089e45438d79466b

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

Syncing with master branch because I want to re-run
update_clang_options.zig in the llvm12 branch.

```

## Parents

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

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

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