# Merge remote-tracking branch 'origin/master' into zir-memory-layout · gitcafe/zig

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

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

Visibility: public

Requested revision: f5aca4a6a1ba867d3bc343a3740454468a7eff13

Requested commit: f5aca4a6a1ba867d3bc343a3740454468a7eff13

Commit: f5aca4a6a1ba867d3bc343a3740454468a7eff13

Tree: 48f43c64fa9ce61c294e3062758ec35bb0c9f544

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into zir-memory-layout

I need the enum arrays that were just merged into master.

```

## Parents

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

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

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