aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-09-13 21:15:01 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-09-13 21:15:01 +0000
commit61c1328eb016476ee7ff5ad65d8224bb43e572db (patch)
tree065632defc328242fe02547b970a8c4cdb413ffa /etc
parent4789686d67aff2b7f0ed589bd72313a45682d580 (diff)
parent7b01d357a29d6aa0dcafb04a9a370332e33eaae1 (diff)
downloadsrc-61c1328eb016476ee7ff5ad65d8224bb43e572db.tar.gz
src-61c1328eb016476ee7ff5ad65d8224bb43e572db.zip
Merge ^/head r352105 through r352307.
Notes
Notes: svn path=/projects/clang900-import/; revision=352308
Diffstat (limited to 'etc')
-rw-r--r--etc/mtree/BSD.tests.dist4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index d1af1f5ff680..d9f4897e026e 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -1010,6 +1010,8 @@
..
limits
..
+ locale
+ ..
m4
..
mkimg
@@ -1080,6 +1082,8 @@
..
fstyp
..
+ jail
+ ..
makefs
..
mixer