diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-04 11:41:34 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-04 11:41:34 +0000 |
commit | 8905677cfdd7eb5c1a4f10fc9cfc3905e28d87a6 (patch) | |
tree | d371f7bce8a54c9aa53773440c8351cf017a87ba /usr/src/lib/libctf/common/libctf.h | |
parent | 363d63cac68cdd10faf2dc4f7b4685713a4706af (diff) | |
parent | 45de8795bcb0e4c49743f37edfdd2c89d5a7863b (diff) | |
download | illumos-joyent-8905677cfdd7eb5c1a4f10fc9cfc3905e28d87a6.tar.gz |
[illumos-gate merge]
commit 45de8795bcb0e4c49743f37edfdd2c89d5a7863b
12683 w(1) and whodo(1) should silently skip dirs it cannot open
commit 6112cec5d5374dff12a12bd285afeb5e660b7154
12517 allow for custom per-distribution branding
commit 15fa1d047e03d3f123546d72f130c5ce4b278eba
12519 Targetdirs: remove left over /usr/4lib
commit 85ba5240e8fe32c7405930a51a93630182ce67d7
12551 cmlb: NULL pointer errors
Conflicts:
usr/src/uts/common/os/logsubr.c
usr/src/uts/common/Makefile.rules
usr/src/cmd/init/init.c
usr/src/cmd/init/Makefile
usr/src/cmd/Adm/sun/Makefile
Diffstat (limited to 'usr/src/lib/libctf/common/libctf.h')
0 files changed, 0 insertions, 0 deletions