Merge branch 'demo'
commit573d784fa07726f05040deb1e0cadf87c15e96d1
authorLauri Tirkkonen <lotheac@iki.fi>
Fri, 26 Jan 2018 12:48:10 +0000 (26 14:48 +0200)
committerLauri Tirkkonen <lotheac@iki.fi>
Fri, 26 Jan 2018 12:48:10 +0000 (26 14:48 +0200)
treeaf518114471502f579bebb14956f4e1c583fc527
parent9dacf55e1140eb0d841009558addd015908b4cb2
parent5079b5b74c57b41686f377c9c063fe92c47a2fa4
Merge branch 'demo'
share/man/man1/Makefile
share/man/man5/filesystem.5
usr/src/Targetdirs
usr/src/cmd/Makefile
usr/src/pkg/manifests/system-core-os.mf