# Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen · gitcafe/zig

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

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

Visibility: public

Requested revision: fc40d2372335e69be175972ffabb55bc7fb77230

Requested commit: fc40d2372335e69be175972ffabb55bc7fb77230

Commit: fc40d2372335e69be175972ffabb55bc7fb77230

Tree: 184daa7845a95f54da0c8c5c6ffba0feffa01b6c

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

Conflicts:
 * build.zig
 * lib/std/array_list.zig
 * lib/std/c/ast.zig
 * lib/std/c/parse.zig
 * lib/std/os/bits/linux.zig

```

## Parents

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

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

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