# Merge branch 'linux_timer' of https://github.com/bscheinman/zig into bscheinman-linux_timer · gitcafe/zig

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

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

Visibility: public

Requested revision: 5895204c99f498aa8ec523a311f12d13c945b077

Requested commit: 5895204c99f498aa8ec523a311f12d13c945b077

Commit: 5895204c99f498aa8ec523a311f12d13c945b077

Tree: b9ebed0137b14f19f58d363a361a8bdc81375718

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'linux_timer' of https://github.com/bscheinman/zig into bscheinman-linux_timer

```

## Parents

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

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

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