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

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

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

Visibility: public

Requested revision: 8b7539bd9554d25599ccff6f0e9ea79aa051946b

Requested commit: 8b7539bd9554d25599ccff6f0e9ea79aa051946b

Commit: 8b7539bd9554d25599ccff6f0e9ea79aa051946b

Tree: 9157fafcbe37f904346fd73042be1d1d299d4da2

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

Conflicts:
  src/clang.zig

Master branch renamed an enum; this branch gave it an explicit tag type
and explicitly initialized values. This commit combines the changes
together.

```

## Parents

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

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

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