# Merge pull request \#2295 from ziglang/stage1-hybrid · gitcafe/zig

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

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

Visibility: public

Requested revision: bc2d60c11f7e90f401a4412d3dc6fca985071169

Requested commit: bc2d60c11f7e90f401a4412d3dc6fca985071169

Commit: bc2d60c11f7e90f401a4412d3dc6fca985071169

Tree: 8e3e4e71dc24d17b4028069381b6aee0a43df347

Author: Andrew Kelley

Committer: GitHub

## Message

```
Merge pull request #2295 from ziglang/stage1-hybrid

stage1 is now a hybrid of C++ and Zig
```

## Parents

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

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

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