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

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

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

Visibility: public

Requested revision: df24ce52b1059232db66e9af425a02df558aa1ca

Requested commit: df24ce52b1059232db66e9af425a02df558aa1ca

Commit: df24ce52b1059232db66e9af425a02df558aa1ca

Tree: bf314eace4c7acd533c5c9532b330ecd8ae65686

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

In particular I wanted to take advantage of the new hex float parsing
code.

```

## Parents

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

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

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