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

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

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

Visibility: public

Requested revision: afe3aae582d5051406832e32fc01374f2a0029b7

Requested commit: afe3aae582d5051406832e32fc01374f2a0029b7

Commit: afe3aae582d5051406832e32fc01374f2a0029b7

Tree: 73d4caa34e1db491e4c2e19ab35fb59c99f54293

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/llvm6' into llvm6

```

## Parents

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

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

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