# Merge remote-tracking branch 'origin/master' into stage2-zig-cc · gitcafe/zig

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

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

Visibility: public

Requested revision: af4cc20ce275aeb0e59eee3d893b2f310c1f0239

Requested commit: af4cc20ce275aeb0e59eee3d893b2f310c1f0239

Commit: af4cc20ce275aeb0e59eee3d893b2f310c1f0239

Tree: cc3ff8fa792c20ff0fc0f1e19e98998cc76c07c2

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into stage2-zig-cc

Master branch added in the concept of library versioning being optional
to main.cpp. It will need to be re-added into this branch before merging
back into master.

```

## Parents

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

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

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