diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-03-30 11:59:04 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-03-30 11:59:04 +0000 |
| commit | 380d528f676476b9d6662f0edea853a36789f58b (patch) | |
| tree | 5cb0437ff0b585ab3d6f3ad8aedf67f220464bb2 /usr/src/man/man1/Makefile | |
| parent | d8cab3215b93aa7d16090428ff303d6ff92263f7 (diff) | |
| parent | 8c16a0e6d0b3d6a8b804825076383c61979302ec (diff) | |
| download | illumos-joyent-380d528f676476b9d6662f0edea853a36789f58b.tar.gz | |
[illumos-gate merge]
commit 8c16a0e6d0b3d6a8b804825076383c61979302ec
12404 audioemu10k: variable may be used uninitialized
commit d52aae2365749461c362fde5a4c1a26a620cfbd3
12310 Add demangle(1) command
commit a61ed2ce7a86a4d6428f2a83eb4739fae945447e
12258 Need native CCID driver
commit ae6d4bc342613e6a5dc7b84b03ecdb0cc9cf7d26
12444 Intel v1 chip topo needs rank information
Conflicts:
usr/src/uts/common/sys/usb/clients/ccid/uccid.h
usr/src/uts/common/sys/usb/clients/ccid/ccid.h
usr/src/uts/common/io/usb/clients/ccid/ccid.c
usr/src/uts/common/Makefile.files
usr/src/test/os-tests/tests/uccid/yk-readonly.c
usr/src/test/os-tests/tests/uccid/notxn-poll.c
usr/src/test/os-tests/tests/uccid/modify.c
usr/src/test/os-tests/tests/Makefile
usr/src/man/man7d/ccid.7d
usr/src/man/man1m/ccidadm.1m
usr/src/lib/libcmdutils/common/nicenum.c
usr/src/lib/cfgadm_plugins/ccid/common/cfga_ccid.c
usr/src/common/ccid/atr.c
usr/src/cmd/devfsadm/usb_link.c
usr/src/cmd/ccidadm/ccidadm.c
usr/src/cmd/ccidadm/Makefile
Diffstat (limited to 'usr/src/man/man1/Makefile')
| -rw-r--r-- | usr/src/man/man1/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/man/man1/Makefile b/usr/src/man/man1/Makefile index d7904100eb..c80c00d8ed 100644 --- a/usr/src/man/man1/Makefile +++ b/usr/src/man/man1/Makefile @@ -14,6 +14,7 @@ # Copyright 2018 Nexenta Systems, Inc. # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2020 Joyent, Inc. # include $(SRC)/Makefile.master @@ -95,6 +96,7 @@ MANFILES= acctcom.1 \ date.1 \ dc.1 \ deallocate.1 \ + demangle.1 \ deroff.1 \ dhcpinfo.1 \ diff.1 \ |