# Merge branch 'std.os.time' of https://github.com/tgschultz/zig into tgschultz-std.os.time · gitcafe/zig

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

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

Visibility: public

Requested revision: 0dcadc61b4ce8fb3ffb75b8f266bff2c6ae149b6

Requested commit: 0dcadc61b4ce8fb3ffb75b8f266bff2c6ae149b6

Commit: 0dcadc61b4ce8fb3ffb75b8f266bff2c6ae149b6

Tree: 5dcf2b82a30084f092f30033f0e23a0ca9160def

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'std.os.time' of https://github.com/tgschultz/zig into tgschultz-std.os.time

```

## Parents

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

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

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