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

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

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

Visibility: public

Requested revision: fbbcf2f30d3fe0a9b0c41de9b737c13737497a3b

Requested commit: fbbcf2f30d3fe0a9b0c41de9b737c13737497a3b

Commit: fbbcf2f30d3fe0a9b0c41de9b737c13737497a3b

Tree: d214c16b689f6002c2e1de3741e5fcec83fd374c

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'adaptive_lock' of https://github.com/kprotty/zig into kprotty-adaptive_lock

```

## Parents

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

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

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