# Merge branch 'tgschultz-std.os.time' · gitcafe/zig

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

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

Visibility: public

Requested revision: 371a3ad4bd7b1fda56654f32b89c176a0197651f

Requested commit: 371a3ad4bd7b1fda56654f32b89c176a0197651f

Commit: 371a3ad4bd7b1fda56654f32b89c176a0197651f

Tree: 9b402e02568e4f62a728a7cec1819363a89d6e9a

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'tgschultz-std.os.time'

```

## Parents

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

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

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