# Merge branch 'master' of https://github.com/ziglang/zig into 5002-fix-entrypoint-with-winmain · gitcafe/zig

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

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

Visibility: public

Requested revision: 3658dd5e89cd16c011bdc52d334c1308f440157b

Requested commit: 3658dd5e89cd16c011bdc52d334c1308f440157b

Commit: 3658dd5e89cd16c011bdc52d334c1308f440157b

Tree: 09564ab2db65acc4a52d82bccbf0eb572fbc865f

Author: Anthony Arian

Committer: Anthony Arian

## Message

```
Merge branch 'master' of https://github.com/ziglang/zig into 5002-fix-entrypoint-with-winmain

```

## Parents

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

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

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