diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-04-30 23:13:17 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-04-30 23:13:17 -0700 |
| commit | dc28f5c3ec61a525d45d9f07a666e62f6598ed0a (patch) | |
| tree | 45daf6a6a98bc0828412fd807eebd2e84e34511a /src/Module.zig | |
| parent | 351b57497b1cf2ea6ee72a3c7cfdb84b924bb368 (diff) | |
| parent | 557eb414eee96201d1ae01b15ebf8955eca1da6d (diff) | |
| download | zig-dc28f5c3ec61a525d45d9f07a666e62f6598ed0a.tar.gz zig-dc28f5c3ec61a525d45d9f07a666e62f6598ed0a.zip | |
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.
Diffstat (limited to 'src/Module.zig')
0 files changed, 0 insertions, 0 deletions