# Merge branch 'kprotty-adaptive_lock' · gitcafe/zig

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

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

Visibility: public

Requested revision: 6d28b28ccc689e6bf8849b1d39e969e8da760999

Requested commit: 6d28b28ccc689e6bf8849b1d39e969e8da760999

Commit: 6d28b28ccc689e6bf8849b1d39e969e8da760999

Tree: 0226ba98b0c3a1cd5c5a441819902a1ca8df16e9

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'kprotty-adaptive_lock'

```

## Parents

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

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

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