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

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

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

Visibility: public

Requested revision: 1ab3dff846cc422ebd915b149b48f3b596ca2455

Requested commit: 1ab3dff846cc422ebd915b149b48f3b596ca2455

Commit: 1ab3dff846cc422ebd915b149b48f3b596ca2455

Tree: 0be491185a1550f152db175330d71bcd1164bd1c

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

Need the latest commit which fixes std and behavior tests for cross
compiled glibcs.

```

## Parents

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

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

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