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

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

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

Visibility: public

Requested revision: 597082adf45cebbf2c6a81c3f732b6d2ce4a1435

Requested commit: 597082adf45cebbf2c6a81c3f732b6d2ce4a1435

Commit: 597082adf45cebbf2c6a81c3f732b6d2ce4a1435

Tree: 9309977e204cceaac2c18efbea2153a69f86d1f4

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

Conflicts:
 * build.zig
 * src/Compilation.zig
 * src/codegen/spirv/spec.zig
 * src/link/SpirV.zig
 * test/stage2/darwin.zig
   - this one might be problematic; start.zig looks for `main` in the
     root source file, not `_main`. Not sure why there is an underscore
     there in master branch.

```

## Parents

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

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

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