# Merge branch 'bscheinman-linux_timer' · gitcafe/zig

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

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

Visibility: public

Requested revision: ca87f55a7b8416e0f0922af7178a8774e81eba97

Requested commit: ca87f55a7b8416e0f0922af7178a8774e81eba97

Commit: ca87f55a7b8416e0f0922af7178a8774e81eba97

Tree: cbebd1f95c5873199d648ea4ba6c214e781fcf2c

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'bscheinman-linux_timer'

```

## Parents

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

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

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