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

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

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

Visibility: public

Requested revision: af64fd2f424401ff66638696b35b1bf385c4b039

Requested commit: af64fd2f424401ff66638696b35b1bf385c4b039

Commit: af64fd2f424401ff66638696b35b1bf385c4b039

Tree: bfd10169c9af10e947dfbbe593ad353604074f62

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into stage2-zig-cc

This merges in the revert that fixes the broken Windows build of master
branch.

```

## Parents

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

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

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