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

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

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

Visibility: public

Requested revision: dc28f5c3ec61a525d45d9f07a666e62f6598ed0a

Requested commit: dc28f5c3ec61a525d45d9f07a666e62f6598ed0a

Commit: dc28f5c3ec61a525d45d9f07a666e62f6598ed0a

Tree: 45daf6a6a98bc0828412fd807eebd2e84e34511a

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

Conflicts:
	lib/std/crypto/25519/field.zig
	lib/std/crypto/poly1305.zig

I had resolved those by removing `comptime` but master branch decided to
make the parameters `comptime`.

This also pulls in the updated default `zig build` install directory.

```

## Parents

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

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

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