# Merge remote-tracking branch 'origin/master' into llvm13 · gitcafe/zig

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

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

Visibility: public

Requested revision: 6aeab0f323ff14d7ad248e18c372573f7a5a8cd1

Requested commit: 6aeab0f323ff14d7ad248e18c372573f7a5a8cd1

Commit: 6aeab0f323ff14d7ad248e18c372573f7a5a8cd1

Tree: 7080297f629f39baa0b742985c5804cf6a2047e8

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into llvm13

Conflicts:
   lib/libcxx/include/__config

d57c0cc3bfeff9af297279759ec2b631e6d95140 added support for DragonFlyBSD
to libc++ by updating some ifdefs. This needed to be synced with llvm13.

```

## Parents

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

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

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