diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2020-01-29 21:09:36 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2020-01-29 21:09:36 +0000 |
commit | bb1d0df51188164f762c1b702dd84cfe3da8f1be (patch) | |
tree | 9c836d548d7cc2e0b0fcab8b578f5140b07405bb /etc | |
parent | f5c072fb4c8b29101a1ee71aaae87ee8ef3514f1 (diff) | |
parent | ec573c57bda0524108c8b7553f356aed7e75f79b (diff) | |
download | src-bb1d0df51188164f762c1b702dd84cfe3da8f1be.tar.gz src-bb1d0df51188164f762c1b702dd84cfe3da8f1be.zip |
Merge ^/head r357179 through r357269.
Notes
Notes:
svn path=/projects/clang1000-import/; revision=357270
Diffstat (limited to 'etc')
-rw-r--r-- | etc/mtree/BSD.usr.dist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 2de5ab5fce1f..0a6c020f7ee2 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -207,9 +207,9 @@ .. .. certs - blacklisted + blacklisted tags=package=caroot .. - trusted + trusted tags=package=caroot .. .. dict |